diff --git a/src/snek/static/chat-input.js b/src/snek/static/chat-input.js
index 8405e26..c0ca401 100644
--- a/src/snek/static/chat-input.js
+++ b/src/snek/static/chat-input.js
@@ -45,17 +45,18 @@ class ChatInputComponent extends HTMLElement {
   }
 
   resolveAutoComplete() {
-    let count = 0;
     let value = null;
 
-    Object.keys(this.allAutoCompletions).forEach((key) => {
-      if (key.startsWith(this.value.split(" ")[0])) {
-        count++;
+    for (const key of Object.keys(this.allAutoCompletions)) {
+      if (key.startsWith(this.value.split(" ", 1)[0])) {
+        if (value) {
+          return null;
+        }
         value = key;
       }
-    });
-    if (count == 1) return value;
-    return null;
+    }
+
+    return value;
   }
 
   isActive() {