diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 77e93e8930..f07d086e4a 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -316,7 +316,8 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
                     break;
             }
         }
-        else {
+        
+        if (!promise) {
             // Send the text message
             promise = matrixService.sendTextMessage($scope.room_id, $scope.textInput);
         }