diff --git a/addons/mail/static/src/discuss/discuss.xml b/addons/mail/static/src/discuss/discuss.xml
index 038d1846089..78e60b094a4 100644
--- a/addons/mail/static/src/discuss/discuss.xml
+++ b/addons/mail/static/src/discuss/discuss.xml
@@ -37,7 +37,7 @@
                     <button t-if="thread.hasMemberList" class="btn" t-att-title="state.activeMode === MODES.MEMBER_LIST ? 'Hide Member List' : 'Show Member List'" t-on-click.stop="toggleMemberList">
                         <i class="fa fa-lg fa-users text-700"/>
                     </button>
-                    <button t-if="thread.type !== 'mailbox'" class="btn" t-ref="settings" title="Show Call Settings" t-on-click="toggleSettings">
+                    <button t-if="thread.allowCalls" class="btn" t-ref="settings" t-att-title="state.activeMode === MODES.SETTINGS ? 'Hide Call Settings' : 'Show Call Settings'" t-on-click="toggleSettings">
                         <i class="fa fa-lg fa-gear text-700"/>
                     </button>
                     <div t-if="props.public and !store.isSmall" class="d-flex align-items-center">
@@ -61,7 +61,7 @@
                     <Composer t-if="thread.type !== 'mailbox' or messageToReplyTo.thread === thread" t-key="thread.localId" composer="thread.composer" autofocus="true" messageEdition="messageEdition" messageToReplyTo="messageToReplyTo" highlightReplyTo="messageHighlight.highlightMessage" onDiscardCallback="() => messageToReplyTo.cancel()" dropzoneRef="contentRef"/>
                 </div>
                 <ChannelMemberList t-if="thread.hasMemberList and state.activeMode === MODES.MEMBER_LIST" thread="thread" className="'o-mail-Discuss-channelMemberList flex-shrink-0 border-start'"/>
-                <CallSettings t-if="state.activeMode === MODES.SETTINGS and thread" thread="thread" className="'o-mail-Discuss-callSettings border-start'"/>
+                <CallSettings t-if="thread.allowCalls and state.activeMode === MODES.SETTINGS" thread="thread" className="'o-mail-Discuss-callSettings border-start'"/>
             </div>
         </div>
         <div t-if="!thread and (!store.isSmall or store.discuss.activeTab === 'mailbox')" class="d-flex flex-grow-1 align-items-center justify-content-center w-100 bg-view">
diff --git a/addons/mail/static/tests/call/call_settings_menu_tests.js b/addons/mail/static/tests/call/call_settings_menu_tests.js
index ac5faeb2235..2ee02303d45 100644
--- a/addons/mail/static/tests/call/call_settings_menu_tests.js
+++ b/addons/mail/static/tests/call/call_settings_menu_tests.js
@@ -80,3 +80,32 @@ QUnit.test("activate blur", async (assert) => {
     assert.containsOnce($, "label[aria-label='Background blur intensity']");
     assert.containsOnce($, "label[aria-label='Edge blur intensity']");
 });
+
+QUnit.test("Inbox should not have any call settings menu", async (assert) => {
+    await startServer();
+    const { openDiscuss } = await start();
+    await openDiscuss("mail.box_inbox");
+    assert.containsNone($, "button[title='Show Call Settings']");
+});
+
+QUnit.test(
+    "Call settings menu should not be visible on selecting a mailbox (from being open)",
+    async (assert) => {
+        patchWithCleanup(browser, {
+            navigator: {
+                ...browser.navigator,
+                mediaDevices: {
+                    enumerateDevices: () => Promise.resolve([]),
+                },
+            },
+        });
+        const pyEnv = await startServer();
+        const channelId = pyEnv["mail.channel"].create({ name: "General" });
+        const { openDiscuss } = await start();
+        await openDiscuss(channelId);
+        await click("button[title='Show Call Settings']");
+        await click("button:contains(Inbox)");
+        assert.containsNone($, "button[title='Hide Call Settings']");
+        assert.containsNone($, ".o-mail-CallSettings");
+    }
+);