diff --git a/MCPForUnity/Editor/Services/Transport/Transports/WebSocketTransportClient.cs b/MCPForUnity/Editor/Services/Transport/Transports/WebSocketTransportClient.cs
index d9ee1c97..4588e4a6 100644
--- a/MCPForUnity/Editor/Services/Transport/Transports/WebSocketTransportClient.cs
+++ b/MCPForUnity/Editor/Services/Transport/Transports/WebSocketTransportClient.cs
@@ -682,16 +682,18 @@ private static Uri BuildWebSocketUri(string baseUrl)
                 throw new InvalidOperationException($"Invalid MCP base URL: {baseUrl}");
             }
 
-            string scheme = httpUri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws";
-            string builder = $"{scheme}://{httpUri.Authority}";
-            if (!string.IsNullOrEmpty(httpUri.AbsolutePath) && httpUri.AbsolutePath != "/")
-            {
-                builder += httpUri.AbsolutePath.TrimEnd('/');
-            }
+            // Replace 0.0.0.0 with localhost for client connections
+            // 0.0.0.0 is only valid for server binding, not client connections
+            string host = httpUri.Host == "0.0.0.0" ? "localhost" : httpUri.Host;
 
-            builder += "/hub/plugin";
+            var builder = new UriBuilder(httpUri)
+            {
+                Scheme = httpUri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws",
+                Host = host,
+                Path = httpUri.AbsolutePath.TrimEnd('/') + "/hub/plugin"
+            };
 
-            return new Uri(builder);
+            return builder.Uri;
         }
     }
 }