diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js
index bea0db5759..7094a703f0 100644
--- a/syweb/webclient/room/room-controller.js
+++ b/syweb/webclient/room/room-controller.js
@@ -435,9 +435,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a
         // Store the command in the history
         history.push(input);
 
-        var promise = commandsService.processInput($scope.room_id, input);
-        var echo = false;
         var isEmote = input.indexOf("/me ") === 0;
+        var promise;
+        if (!isEmote) {
+            promise = commandsService.processInput($scope.room_id, input);
+        }
+        var echo = false;
+        
         
         if (!promise) { // not a non-echoable command
             echo = true;