diff --git a/web/src/compose_tooltips.ts b/web/src/compose_tooltips.ts
index 698d830079..61e10dc5cc 100644
--- a/web/src/compose_tooltips.ts
+++ b/web/src/compose_tooltips.ts
@@ -215,8 +215,11 @@ export function initialize(): void {
         trigger: "mouseenter",
         appendTo: () => document.body,
         onShow(instance) {
-            // Don't show Send button tooltip if the popover is displayed.
-            if (popover_menus.is_scheduled_messages_popover_displayed()) {
+            // Don't show send-area tooltips if the popover is displayed or if the send button is disabled.
+            if (
+                popover_menus.is_scheduled_messages_popover_displayed() ||
+                $(".message-send-controls").hasClass("disabled-message-send-controls")
+            ) {
                 return false;
             }
             if (user_settings.enter_sends) {
diff --git a/web/styles/compose.css b/web/styles/compose.css
index 36ff61ab83..e7b2e58291 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -1410,7 +1410,7 @@ textarea.new_message_textarea {
 
     &.disabled-message-send-controls {
         & button {
-            pointer-events: none;
+            cursor: default;
             opacity: 0.5;
         }
     }