diff --git a/src/ModelContextProtocol.Core/Client/McpClientExtensions.cs b/src/ModelContextProtocol.Core/Client/McpClientExtensions.cs
index 60a9c3a6..a2c64030 100644
--- a/src/ModelContextProtocol.Core/Client/McpClientExtensions.cs
+++ b/src/ModelContextProtocol.Core/Client/McpClientExtensions.cs
@@ -118,7 +118,7 @@ public static async ValueTask<IList<McpClientTool>> ListToolsAsync(
 
             cursor = toolResults.NextCursor;
         }
-        while (cursor is not null);
+        while (!string.IsNullOrEmpty(cursor));
 
         return tools;
     }