diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 68eca80..d2a77d9 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -137,8 +137,10 @@ public final class ChatSceneController {
 
 	@FXML
 	private void messageTextUpdated(KeyEvent e) {
-		if (settings.isEnterToSend() && e.getCode() == KeyCode.ENTER || !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL) postMessage();
-		else postButton.setDisable(messageTextArea.getText().isBlank());
+		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
+				|| !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL)
+			postMessage();
+		else postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
 	}
 
 	/**