diff --git a/internal/client/client.go b/internal/client/client.go
index be29c54c3a..60ee189243 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -545,6 +545,12 @@ func (a *APIClient) SwitchContext(name string) error {
 	if err := a.config.SwitchContext(name); err != nil {
 		return err
 	}
+
+	if !a.CheckConnectivity() {
+		log.Debug().Msg("No connectivity, skipping cache invalidation")
+	} else if err := a.invalidateCache(); err != nil {
+		return err
+	}
 	a.reset()
 	ResetMetrics()