diff --git a/src/renderer/src/Composer.tsx b/src/renderer/src/Composer.tsx
index ae1c8090..16d040e7 100644
--- a/src/renderer/src/Composer.tsx
+++ b/src/renderer/src/Composer.tsx
@@ -414,6 +414,8 @@ export const Composer = memo(function Composer({
         runtime: runtimeControlsProvider,
       })
     : "";
+  const composerContextAvailable =
+    supervisorEnabled === true || knowledgeLibraries.length > 0;
   const composerOptionSummary = [
     enabledKnowledgeLibraryIds.length > 0
       ? t("composer.knowledge.select", { count: enabledKnowledgeLibraryIds.length })
@@ -815,7 +817,8 @@ export const Composer = memo(function Composer({
               </button>
             </div>
             <div className="composer__configuration" role="group" aria-label={t("composer.settings")}>
-              <>
+              {composerContextAvailable && (
+                <>
                   <button
                     aria-controls="composer-options"
                     aria-expanded={composerOptionsOpen}
@@ -878,7 +881,8 @@ export const Composer = memo(function Composer({
                         />
                       </label>
                     )}
-                    <div
+                    {knowledgeLibraries.length > 0 && (
+                      <div
                         className="knowledge-scope"
                         onBlurCapture={(event) => {
                           if (
@@ -1015,9 +1019,11 @@ export const Composer = memo(function Composer({
                             </div>
                           </div>
                         )}
-                    </div>
+                      </div>
+                    )}
                   </div>
-              </>
+                </>
+              )}
               <ComposerMenuSelect
                 ariaLabel={t("composer.expertLabel")}
                 className="composer-picker--expert"
diff --git a/tests/support/story-graph-switch-main.ts b/tests/support/story-graph-switch-main.ts
index 52fcd770..723253d9 100644
--- a/tests/support/story-graph-switch-main.ts
+++ b/tests/support/story-graph-switch-main.ts
@@ -73,6 +73,8 @@ app.whenReady().then(async () => {
   const scenarios: object[] = []
   try {
     await win.loadURL(process.env.GB_MCP_URL!)
+    await js('window.goodbuddy.updates.updateSettings({heartbeatEnabled:true})')
+    await wait('document.body.innerText.includes("Supervisor") || document.body.innerText.includes("监督")')
     await open()
     assert.equal(await binding.available(), true)
     for (const width of [1280, 390]) for (const theme of ['light', 'dark']) {
diff --git a/tests/support/unified-execution-main.ts b/tests/support/unified-execution-main.ts
index 628d7faa..e2762305 100644
--- a/tests/support/unified-execution-main.ts
+++ b/tests/support/unified-execution-main.ts
@@ -75,6 +75,7 @@ app.whenReady().then(async () => {
   }
   try {
     await win.loadURL(process.env.GB_MCP_URL!)
+    await js('window.goodbuddy.updates.updateSettings({heartbeatEnabled:true})')
     await wait('!!document.querySelector(".composer textarea") && document.body.innerText.includes("Keep until confirmed")')
     await assertNoMode('.composer')
     await click('.composer__options-trigger')