diff --git a/js/client-chat.js b/js/client-chat.js
index 5f0a6cdad..48368171b 100644
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -51,6 +51,10 @@
 			e.stopPropagation();
 			var text;
 			if ((text = this.$chatbox.val())) {
+				if (!$.trim(text)) {
+					this.$chatbox.val('');
+					return;
+				}
 				this.tabComplete.reset();
 				// this.chatHistory.push(text);
 				text = this.parseCommand(text);