diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index 9cbb377e7..f1a1c28ee 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -1119,7 +1119,7 @@ func (r *mutationResolver) CreateOrganization(ctx context.Context, input types.C
 		return nil, fmt.Errorf("cannot create organization: %w", err)
 	}
 
-	authz.AddUserToOrganization(
+	err = authz.AddUserToOrganization(
 		ctx,
 		currentUser.ID,
 		organization.ID,
@@ -1145,8 +1145,10 @@ func (r *mutationResolver) CreateOrganization(ctx context.Context, input types.C
 	}
 
 	// Append tenant to allowed one
-	tenantIDs, _ := ctx.Value(userTenantContextKey).(*[]gid.TenantID)
-	*tenantIDs = append(*tenantIDs, organization.ID.TenantID())
+	access, _ := ctx.Value(userTenantContextKey).(*userTenantAccess)
+	if access != nil {
+		access.tenantIDs = append(access.tenantIDs, organization.ID.TenantID())
+	}
 
 	return &types.CreateOrganizationPayload{
 		OrganizationEdge: types.NewOrganizationEdge(organization, coredata.OrganizationOrderFieldCreatedAt),