diff --git a/src/main/java/org/patinanetwork/codebloom/api/external/ExternalController.java b/src/main/java/org/patinanetwork/codebloom/api/external/ExternalController.java
index c15b751d9..194ea3b18 100644
--- a/src/main/java/org/patinanetwork/codebloom/api/external/ExternalController.java
+++ b/src/main/java/org/patinanetwork/codebloom/api/external/ExternalController.java
@@ -68,7 +68,7 @@ public ResponseEntity<ApiResponder<List<UserWithScore>>> getGwcUsers(
             throw new ResponseStatusException(HttpStatus.FORBIDDEN, "API key does not have GWC read access");
         }
 
-        if (leaderboardRepository.getLeaderboardMetadataById(leaderboardId) == null) {
+        if (leaderboardRepository.getLeaderboardMetadataById(leaderboardId).isEmpty()) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Leaderboard not found");
         }
         LeaderboardFilterOptions options =