diff --git a/common/cluster/frontend_http_client.go b/common/cluster/frontend_http_client.go
index 246ba84b7df..5445410c929 100644
--- a/common/cluster/frontend_http_client.go
+++ b/common/cluster/frontend_http_client.go
@@ -117,7 +117,7 @@ func (c *FrontendHTTPClientCache) evictionCallback(oldClusterMetadata map[string
 		}
 
 		newClusterInfo, exists := newClusterMetadata[oldClusterName]
-		if !exists || oldClusterInfo.HTTPAddress != newClusterInfo.HTTPAddress {
+		if !exists || newClusterInfo == nil || oldClusterInfo.HTTPAddress != newClusterInfo.HTTPAddress {
 			// Cluster was removed or had its HTTP address changed, so invalidate the cached client for that cluster.
 			client, ok := c.clients.Pop(oldClusterName)
 			if ok {