diff --git a/components/canvas/CanvasChatPanel.tsx b/components/canvas/CanvasChatPanel.tsx
index bca416066..cca04cea2 100644
--- a/components/canvas/CanvasChatPanel.tsx
+++ b/components/canvas/CanvasChatPanel.tsx
@@ -4868,12 +4868,8 @@ export function CanvasChatPanel({
                 ? {
                     ...session,
                     mode,
-                    clawdSkillTagId:
-                      mode === "clawd" ? session.clawdSkillTagId || null : null,
-                    clawdSkillTagPromptApplied:
-                      mode === "clawd"
-                        ? session.clawdSkillTagPromptApplied === true
-                        : false,
+                    clawdSkillTagId: null,
+                    clawdSkillTagPromptApplied: false,
                     updatedAt: Date.now(),
                   }
                 : session
@@ -9847,9 +9843,10 @@ export function CanvasChatPanel({
       const textContent = normalizeClawdComposerText(input);
       const tableFilesSnapshot = [...clawdTableFiles];
       const hasTableFiles = tableFilesSnapshot.length > 0;
-      const clawdSkillTagForRequest = activeClawdSkillTag || selectedSkillTag;
+      const clawdSkillTagForRequest = selectedSkillTag || activeClawdSkillTag;
       const shouldIncludeClawdSkillTagPrompt = Boolean(
-        clawdSkillTagForRequest && !activeClawdSkillTagPromptApplied
+        clawdSkillTagForRequest &&
+          (selectedSkillTag || !activeClawdSkillTagPromptApplied)
       );
       const clawdSkillTagPrompt = shouldIncludeClawdSkillTagPrompt
         ? buildClawdSkillTagPrompt(clawdSkillTagForRequest)