diff --git a/surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/stack.py b/surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/stack.py
index f084ee863..4e5eba95e 100644
--- a/surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/stack.py
+++ b/surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/stack.py
@@ -53,9 +53,6 @@ from app.agents.chat.multi_agent_chat.subagents.builtins.knowledge_base.agent im
 from app.agents.chat.multi_agent_chat.subagents.builtins.knowledge_base.ask_knowledge_base_tool import (
     build_ask_knowledge_base_tool,
 )
-from app.agents.chat.multi_agent_chat.subagents.shared.middleware.middleware_stack import (
-    build_subagent_middleware_stack,
-)
 from app.db import ChatVisibility
 
 from .action_log import build_action_log_mw
@@ -77,6 +74,9 @@ from .noop_injection import build_noop_injection_mw
 from .otel_span import build_otel_mw
 from .plugins import build_plugin_middlewares
 from .skills import build_skills_mw
+from .subagent_stack import (
+    build_subagent_middleware_stack,
+)
 from .tool_call_repair import build_repair_mw
 
 
diff --git a/surfsense_backend/app/agents/chat/multi_agent_chat/subagents/shared/middleware/middleware_stack.py b/surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/subagent_stack.py
similarity index 100%
rename from surfsense_backend/app/agents/chat/multi_agent_chat/subagents/shared/middleware/middleware_stack.py
rename to surfsense_backend/app/agents/chat/multi_agent_chat/main_agent/middleware/subagent_stack.py
diff --git a/surfsense_backend/app/agents/chat/multi_agent_chat/subagents/shared/middleware/__init__.py b/surfsense_backend/app/agents/chat/multi_agent_chat/subagents/shared/middleware/__init__.py
deleted file mode 100644
index e69de29bb..000000000