diff --git a/servers/Azure.Mcp.Server/changelog-entries/1774535859275.yaml b/servers/Azure.Mcp.Server/changelog-entries/1774535859275.yaml
new file mode 100644
index 0000000000..8ad6904bbc
--- /dev/null
+++ b/servers/Azure.Mcp.Server/changelog-entries/1774535859275.yaml
@@ -0,0 +1,3 @@
+changes:
+  - section: "Bugs Fixed"
+    description: "Fix incorrect SignalR caching"
\ No newline at end of file
diff --git a/tools/Azure.Mcp.Tools.SignalR/src/Services/SignalRService.cs b/tools/Azure.Mcp.Tools.SignalR/src/Services/SignalRService.cs
index 3f0fd6f589..d974c9d11f 100644
--- a/tools/Azure.Mcp.Tools.SignalR/src/Services/SignalRService.cs
+++ b/tools/Azure.Mcp.Tools.SignalR/src/Services/SignalRService.cs
@@ -76,9 +76,9 @@ public async Task<IEnumerable<Runtime>> GetRuntimeAsync(
                 {
                     runtimes.Add(ConvertToRuntimeModel(runtime));
                 }
-
-                await _cacheService.SetAsync(CacheGroup, cacheKey, signalRName, s_cacheDuration, cancellationToken);
             }
+
+            await _cacheService.SetAsync(CacheGroup, cacheKey, runtimes, s_cacheDuration, cancellationToken);
         }
         else
         {
@@ -106,7 +106,7 @@ public async Task<IEnumerable<Runtime>> GetRuntimeAsync(
             }
 
             runtimes.Add(ConvertToRuntimeModel(signalRResource.Value));
-            await _cacheService.SetAsync(CacheGroup, cacheKey, signalRName, s_cacheDuration, cancellationToken);
+            await _cacheService.SetAsync(CacheGroup, cacheKey, runtimes, s_cacheDuration, cancellationToken);
         }
 
         return runtimes;