diff --git a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
index 781d1c0ed..d779f864b 100644
--- a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
@@ -293,7 +293,8 @@ public void RefreshSelectedClient()
             if (selectedClientIndex >= 0 && selectedClientIndex < configurators.Count)
             {
                 var client = configurators[selectedClientIndex];
-                RefreshClientStatus(client, forceImmediate: true);
+                bool forceImmediate = client is not ClaudeCliMcpConfigurator;
+                RefreshClientStatus(client, forceImmediate);
                 UpdateManualConfiguration();
                 UpdateClaudeCliPathVisibility();
             }
@@ -318,14 +319,6 @@ private void RefreshClientStatus(IMcpClientConfigurator client, bool forceImmedi
 
         private void RefreshClaudeCliStatus(IMcpClientConfigurator client, bool forceImmediate)
         {
-            if (forceImmediate)
-            {
-                MCPServiceLocator.Client.CheckClientStatus(client, attemptAutoRewrite: false);
-                lastStatusChecks[client] = DateTime.UtcNow;
-                ApplyStatusToUi(client);
-                return;
-            }
-
             bool hasStatus = lastStatusChecks.ContainsKey(client);
             bool needsRefresh = !hasStatus || ShouldRefreshClient(client);
 
@@ -338,7 +331,7 @@ private void RefreshClaudeCliStatus(IMcpClientConfigurator client, bool forceImm
                 ApplyStatusToUi(client);
             }
 
-            if (needsRefresh && !statusRefreshInFlight.Contains(client))
+            if ((forceImmediate || needsRefresh) && !statusRefreshInFlight.Contains(client))
             {
                 statusRefreshInFlight.Add(client);
                 ApplyStatusToUi(client, showChecking: true);