diff --git a/crates/goose/src/agents/agent.rs b/crates/goose/src/agents/agent.rs
index 9d248998d9..58f075cd67 100644
--- a/crates/goose/src/agents/agent.rs
+++ b/crates/goose/src/agents/agent.rs
@@ -264,10 +264,6 @@ impl Agent {
         let initial_messages = conversation.messages().clone();
         let config = Config::global();
 
-        if let Err(e) = self.enable_subagent_extension().await {
-            warn!("Failed to enable subagent extension: {}", e);
-        }
-
         let (tools, toolshim_tools, system_prompt) =
             self.prepare_tools_and_prompt(working_dir).await?;
         let goose_mode = config.get_goose_mode().unwrap_or(GooseMode::Auto);
diff --git a/crates/goose/src/agents/extension.rs b/crates/goose/src/agents/extension.rs
index ff8204daf0..d99eeac90f 100644
--- a/crates/goose/src/agents/extension.rs
+++ b/crates/goose/src/agents/extension.rs
@@ -109,7 +109,7 @@ pub static PLATFORM_EXTENSIONS: Lazy<HashMap<&'static str, PlatformExtensionDef>
             PlatformExtensionDef {
                 name: subagent_client::EXTENSION_NAME,
                 description: "Delegate tasks to independent subagents",
-                default_enabled: false,
+                default_enabled: true,
                 client_factory: |ctx| Box::new(subagent_client::SubagentClient::new(ctx).unwrap()),
             },
         );
diff --git a/crates/goose/src/agents/subagent_client.rs b/crates/goose/src/agents/subagent_client.rs
index a4e8673dad..404d00c4e7 100644
--- a/crates/goose/src/agents/subagent_client.rs
+++ b/crates/goose/src/agents/subagent_client.rs
@@ -6,6 +6,7 @@ use crate::agents::subagent_tool::{
 };
 use crate::agents::tool_execution::DeferredToolCall;
 use crate::config::get_enabled_extensions;
+use crate::session::{SessionManager, SessionType};
 use anyhow::Result;
 use async_trait::async_trait;
 use rmcp::model::{
@@ -52,7 +53,7 @@ impl SubagentClient {
     }
 
     async fn get_extensions(&self) -> Vec<crate::agents::ExtensionConfig> {
-        if let Some(em) = self
+        let extensions = if let Some(em) = self
             .context
             .extension_manager
             .as_ref()
@@ -61,7 +62,11 @@ impl SubagentClient {
             em.get_extension_configs().await
         } else {
             get_enabled_extensions()
-        }
+        };
+        extensions
+            .into_iter()
+            .filter(|ext| ext.name() != EXTENSION_NAME)
+            .collect()
     }
 
     async fn get_sub_recipes(&self) -> std::collections::HashMap<String, crate::recipe::SubRecipe> {
@@ -136,15 +141,24 @@ impl McpClientTrait for SubagentClient {
             ]))));
         }
 
+        if let Some(ref session_id) = self.context.session_id {
+            if let Ok(session) = SessionManager::get_session(session_id, false).await {
+                if session.session_type == SessionType::SubAgent {
+                    return Ok(DeferredToolCall::from(Ok(CallToolResult::error(vec![
+                        Content::text("Subagents cannot spawn subagents."),
+                    ]))));
+                }
+            }
+        }
+
         let Some(provider) = self.get_provider().await else {
             return Ok(DeferredToolCall::from(Ok(CallToolResult::error(vec![
                 Content::text("No provider configured"),
             ]))));
         };
 
-        // Get working_dir from parent session, fall back to current dir
         let working_dir = match &self.context.session_id {
-            Some(session_id) => crate::session::SessionManager::get_session(session_id, false)
+            Some(session_id) => SessionManager::get_session(session_id, false)
                 .await
                 .map(|s| s.working_dir)
                 .unwrap_or_else(|_| std::env::current_dir().unwrap_or_else(|_| ".".into())),
diff --git a/crates/goose/src/config/extensions.rs b/crates/goose/src/config/extensions.rs
index 4ad4e84de3..a7bf586c8d 100644
--- a/crates/goose/src/config/extensions.rs
+++ b/crates/goose/src/config/extensions.rs
@@ -66,7 +66,7 @@ fn get_extensions_map() -> IndexMap<String, ExtensionEntry> {
                             bundled: Some(true),
                             available_tools: Vec::new(),
                         },
-                        enabled: true,
+                        enabled: def.default_enabled,
                     },
                 );
             }