diff --git a/cmd/server-bot/main.go b/cmd/server-bot/main.go
index fd527f8..13e206e 100644
--- a/cmd/server-bot/main.go
+++ b/cmd/server-bot/main.go
@@ -99,11 +99,6 @@ func main() {
 	var searchEnable bool
 	searchEnabled := os.Getenv("SEARCH_ENABLE")
 	if searchEnabled == "true" || searchEnabled == "1" {
-		if len(mcpClientAddrs) != 0 {
-			logger.Error("MCP clients are not supported with search enabled, please remove MCP_SERVERS environment variable")
-
-			return
-		}
 		searchEnable = true
 	}
 
diff --git a/go.mod b/go.mod
index 8d4e018..c743b34 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
 	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/term v0.33.0 // indirect
 	golang.org/x/text v0.27.0 // indirect
-	google.golang.org/genai v1.41.0 // indirect
+	google.golang.org/genai v1.51.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/grpc v1.73.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
diff --git a/go.sum b/go.sum
index 82ad6ce..10489c2 100644
--- a/go.sum
+++ b/go.sum
@@ -119,6 +119,8 @@ golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
 golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 google.golang.org/genai v1.41.0 h1:ayXl75LjTmqTu0y94yr96d17gIb4zF8gWVzX2TgioEY=
 google.golang.org/genai v1.41.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
+google.golang.org/genai v1.51.0 h1:IZGuUqgfx40INv3hLFGCbOSGp0qFqm7LVmDghzNIYqg=
+google.golang.org/genai v1.51.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
diff --git a/internal/ai/gemini/config.go b/internal/ai/gemini/config.go
index d4f27e3..28d68f5 100644
--- a/internal/ai/gemini/config.go
+++ b/internal/ai/gemini/config.go
@@ -57,9 +57,13 @@ func CustomConfig(searchEnable bool) any {
 	}
 	// If the search is enabled, add this as a custom config, it is GEMINI ONLY!
 	if searchEnable {
+		ist := true
 		geminiSpecConfig.Tools = []*genai.Tool{
 			{GoogleSearch: &genai.GoogleSearch{}},
 		}
+		geminiSpecConfig.ToolConfig = &genai.ToolConfig{
+			IncludeServerSideToolInvocations: &ist,
+		}
 	}
 
 	return geminiSpecConfig