diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index 87b47f4ad..fc83007c2 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -140,8 +140,10 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 		mcpManager := mcp.NewManager()
 		defaultAgent := al.registry.GetDefaultAgent()
 		workspacePath := ""
-		if defaultAgent != nil {
+		if defaultAgent != nil && defaultAgent.Workspace != "" {
 			workspacePath = defaultAgent.Workspace
+		} else {
+			workspacePath = al.cfg.WorkspacePath()
 		}
 
 		if err := mcpManager.LoadFromMCPConfig(ctx, al.cfg.Tools.MCP, workspacePath); err != nil {