diff --git a/pkg/store/kubeconfig_store_plugins.go b/pkg/store/kubeconfig_store_plugins.go
index 3bbba8cf..f68c39e9 100644
--- a/pkg/store/kubeconfig_store_plugins.go
+++ b/pkg/store/kubeconfig_store_plugins.go
@@ -87,7 +87,11 @@ func (s *PluginStore) GetID() string {
 
 	id, err := s.Client.GetID(ctx)
 	if err != nil {
-		return fmt.Sprintf("%s.default", s.GetKind())
+		localID := "default"
+		if s.KubeconfigStore.ID != nil {
+			localID = *s.KubeconfigStore.ID
+		}
+		return fmt.Sprintf("%s.%s", s.GetKind(), localID)
 	}
 	return id
 }