diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index d74ac052..44ff2fa9 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -579,8 +579,12 @@ a {
     background-position: center;
 }
 
-.MessageComposer_input > button.send:disabled {
-    background-color: #E3E8F0;
+.MessageComposer.MessageComposer_canSend button.sendFile {
+    display: none;
+}
+
+.MessageComposer:not(.MessageComposer_canSend) button.send {
+    display: none;
 }
 
 .SettingsBody {
diff --git a/src/platform/web/ui/session/room/MessageComposer.js b/src/platform/web/ui/session/room/MessageComposer.js
index 08048b80..77d501d0 100644
--- a/src/platform/web/ui/session/room/MessageComposer.js
+++ b/src/platform/web/ui/session/room/MessageComposer.js
@@ -65,11 +65,13 @@ export class MessageComposer extends TemplateView {
             t.button({
                 className: "send",
                 title: vm.i18n`Send`,
-                disabled: vm => !vm.canSend,
                 onClick: () => this._trySend(),
             }, vm.i18n`Send`),
         ]);
-        return t.div({ className: "MessageComposer" }, [replyPreview, input]);
+        return t.div({ className: {
+            MessageComposer: true,
+            MessageComposer_canSend: vm => vm.canSend
+        } }, [replyPreview, input]);
     }
 
     unmount() {