diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index b32a44219a..ce519b1ea7 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -42,7 +42,7 @@ limitations under the License.
         white-space: pre-wrap;
         word-wrap: break-word;
         outline: none;
-        overflow-x: auto;
+        overflow-x: hidden;
 
         span.mx_UserPill, span.mx_RoomPill {
             padding-left: 21px;