diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c702917fef7d36997638bd98542f3f455c75946d..c8ca771b25a1c2ad8ea8ac22906ef0b6f6ece08d 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -485,7 +485,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
             promise.then(
                 function() {
                     console.log("Request successfully sent");
-                    $scope.textInput = "";
+                    if (!echo) {
+                        $scope.textInput = "";
+                    }
 /*
                     if (echoMessage) {
                         // Remove the fake echo message from the room messages