diff --git a/pkg/subroutines/extensions.go b/pkg/subroutines/extensions.go
index 807bdf2..2036b99 100644
--- a/pkg/subroutines/extensions.go
+++ b/pkg/subroutines/extensions.go
@@ -207,14 +207,10 @@ func getParentAccount(ctx context.Context, cl client.Client, ns string) (*v1alph
 func getParentAccountWithKcp(ctx context.Context, cl client.Client) (*v1alpha1.Account, *string, error) {
 
 	cluster, ok := kontext.ClusterFrom(ctx)
-	if !ok {
+	if !ok || cluster.Empty() {
 		return nil, nil, fmt.Errorf("no cluster context found, this is a configuration error")
 	}
 
-	if cluster.Empty() {
-		return nil, nil, fmt.Errorf("no cluster in context is empty")
-	}
-
 	wsCtx := kontext.WithCluster(ctx, "")
 	list := &tenancyv1alpha1.WorkspaceList{}