diff --git a/internal/ghmcp/server.go b/internal/ghmcp/server.go
index 0e338cfd9..36b14c880 100644
--- a/internal/ghmcp/server.go
+++ b/internal/ghmcp/server.go
@@ -111,9 +111,10 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 
 	enabledToolsets := cfg.EnabledToolsets
 
-	// If dynamic toolsets are enabled, remove "all" from the enabled toolsets
+	// If dynamic toolsets are enabled, remove "all" and "default" from the enabled toolsets
 	if cfg.DynamicToolsets {
 		enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataAll.ID)
+		enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataDefault.ID)
 	}
 
 	// Clean up the passed toolsets