diff --git a/internal/usergrant/repository/view/user_grant_view.go b/internal/usergrant/repository/view/user_grant_view.go
index 7b9015a16..27b61ea79 100644
--- a/internal/usergrant/repository/view/user_grant_view.go
+++ b/internal/usergrant/repository/view/user_grant_view.go
@@ -56,9 +56,9 @@ func SearchUserGrants(db *gorm.DB, table string, req *grant_model.UserGrantSearc
 		}
 	}
 
-	if withGranted {
+	if orgID != "" && withGranted {
 		db = db.Where("resource_owner = ? OR project_owner = ?", orgID, orgID)
-	} else {
+	} else if orgID != "" {
 		db = db.Where("resource_owner = ?", orgID)
 	}
 	query := repository.PrepareSearchQuery(table, model.UserGrantSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})