diff --git a/internal/api/authz/context.go b/internal/api/authz/context.go
index 63af939e95..8e1b9f74a4 100644
--- a/internal/api/authz/context.go
+++ b/internal/api/authz/context.go
@@ -80,6 +80,9 @@ func VerifyTokenAndCreateCtxData(ctx context.Context, token, orgID string, t *To
 	if err := checkOrigin(ctx, origins); err != nil {
 		return CtxData{}, err
 	}
+	if orgID == "" {
+		orgID = resourceOwner
+	}
 	return CtxData{
 		UserID:            userID,
 		OrgID:             orgID,