diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/structure/data/PsiStructureRepository.kt b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/structure/data/PsiStructureRepository.kt
index e9604d98..b8157053 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/structure/data/PsiStructureRepository.kt
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/structure/data/PsiStructureRepository.kt
@@ -140,14 +140,6 @@ class PsiStructureRepository(
                     .filterIsInstance<CodeAnalyzeTagDetails>()
                     .forEach { tagManager.remove(it) }
 
-                if (tagManager.getTags().any { it is EditorTagDetails || it is FileTagDetails }) {
-                    tagManager.addTag(
-                        CodeAnalyzeTagDetails().apply {
-                            selected = newState.chatCompletionSettings.psiStructureEnabled
-                        }
-                    )
-                }
-
                 if (newState.chatCompletionSettings.psiStructureEnabled) {
                     analyzePsiDepth = newState.chatCompletionSettings.psiStructureAnalyzeDepth
                     enable()
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/header/UserInputHeaderPanel.kt b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/header/UserInputHeaderPanel.kt
index 6f8e6064..9ec2e3e2 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/header/UserInputHeaderPanel.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/header/UserInputHeaderPanel.kt
@@ -174,14 +174,6 @@ class UserInputHeaderPanel(
             tagManager.addTag(EditorTagDetails(selectedFile))
         }
 
-        val psiStructureEnabled = service<ConfigurationSettings>().state
-            .chatCompletionSettings
-            .psiStructureEnabled
-
-        tagManager.addTag(
-            CodeAnalyzeTagDetails().apply { selected = psiStructureEnabled }
-        )
-
         EditorUtil.getOpenLocalFiles(project)
             .filterNot { it == selectedFile }
             .take(INITIAL_VISIBLE_FILES)