diff --git a/src/main/java/com/gcc/commissionerreview/service/VolunteerService.java b/src/main/java/com/gcc/commissionerreview/service/VolunteerService.java
index 15f7749..70efc50 100644
--- a/src/main/java/com/gcc/commissionerreview/service/VolunteerService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/VolunteerService.java
@@ -1366,11 +1366,11 @@ public class VolunteerService {
 
                     FROM volunteer_information vi
 
-                    WHERE vi.preferred_zones = '0'
-                       OR FIND_IN_SET(
-                            CAST(? AS UNSIGNED),
-                            vi.preferred_zones
-                       ) > 0
+                    WHERE vi.preferred_zones <> '0'
+                      AND CAST(? AS UNSIGNED) = CAST(
+                            SUBSTRING_INDEX(vi.preferred_zones, ',', 1)
+                          AS UNSIGNED
+                      )
 
                     ORDER BY vi.volunteer_id
                     """;