diff --git a/client/src/components/Sidebar.tsx b/client/src/components/Sidebar.tsx
index 1b7f78e9..279933fc 100644
--- a/client/src/components/Sidebar.tsx
+++ b/client/src/components/Sidebar.tsx
@@ -285,20 +285,30 @@ const Sidebar = ({
                 <label className="text-sm font-medium" htmlFor="sse-url-input">
                   URL
                 </label>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Input
-                      id="sse-url-input"
-                      placeholder="URL"
-                      value={sseUrl}
-                      onChange={(e) => setSseUrl(e.target.value)}
-                      className="font-mono"
-                    />
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    {sseUrl || `Enter URL to MCP server`}
-                  </TooltipContent>
-                </Tooltip>
+                {sseUrl ? (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <Input
+                        id="sse-url-input"
+                        placeholder="URL"
+                        value={sseUrl}
+                        onChange={(e) => setSseUrl(e.target.value)}
+                        className="font-mono"
+                      />
+                    </TooltipTrigger>
+                    <TooltipContent>
+                      {sseUrl}
+                    </TooltipContent>
+                  </Tooltip>
+                ) : (
+                  <Input
+                    id="sse-url-input"
+                    placeholder="URL"
+                    value={sseUrl}
+                    onChange={(e) => setSseUrl(e.target.value)}
+                    className="font-mono"
+                  />
+                )}
               </div>
               <div className="space-y-2">
                 <Button