diff --git a/internal/apptoken/repository_token_grant.go b/internal/apptoken/repository_token_grant.go
index d2a355c2f2..e0b34d463f 100644
--- a/internal/apptoken/repository_token_grant.go
+++ b/internal/apptoken/repository_token_grant.go
@@ -193,17 +193,21 @@ func (r *Repository) selectRecursiveQuery(ctx context.Context, isGlobal, isOrg,
 	case isGlobal:
 		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org, scope.Project}) {
 			return grantsForGlobalTokenGlobalOrgProjectResourcesRecursiveQuery, nil
-		} else if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org}) {
+		}
+		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org}) {
 			return grantsForGlobalTokenGlobalOrgResourcesRecursiveQuery, nil
-		} else if slices.Equal(resourceAllowedIn, []scope.Type{scope.Project}) {
+		}
+		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Project}) {
 			return grantsForGlobalTokenProjectResourcesRecursiveQuery, nil
 		}
 	case isOrg:
 		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org, scope.Project}) {
 			return grantsForOrgTokenGlobalOrgProjectResourcesRecursiveQuery, nil
-		} else if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org}) {
+		}
+		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Global, scope.Org}) {
 			return grantsForOrgTokenGlobalOrgResourcesRecursiveQuery, nil
-		} else if slices.Equal(resourceAllowedIn, []scope.Type{scope.Project}) {
+		}
+		if slices.Equal(resourceAllowedIn, []scope.Type{scope.Project}) {
 			return grantsForOrgTokenProjectResourcesRecursiveQuery, nil
 		}
 	case isProject: