diff --git a/infra/config-store/src/main/java/com/simprints/infra/config/store/models/AgeGroup.kt b/infra/config-store/src/main/java/com/simprints/infra/config/store/models/AgeGroup.kt
index 9cae84d647..8a7aa284ea 100644
--- a/infra/config-store/src/main/java/com/simprints/infra/config/store/models/AgeGroup.kt
+++ b/infra/config-store/src/main/java/com/simprints/infra/config/store/models/AgeGroup.kt
@@ -5,5 +5,5 @@ data class AgeGroup(
     val endExclusive: Int?,
 ) {
     fun isEmpty(): Boolean =
-        startInclusive == 0 && endExclusive == null
+        startInclusive == 0 && (endExclusive == null || endExclusive == 0)
 }
diff --git a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/models/FingerprintConfigurationTest.kt b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/models/FingerprintConfigurationTest.kt
index e9169892f4..803cfd68ce 100644
--- a/infra/config-store/src/test/java/com/simprints/infra/config/store/local/models/FingerprintConfigurationTest.kt
+++ b/infra/config-store/src/test/java/com/simprints/infra/config/store/local/models/FingerprintConfigurationTest.kt
@@ -58,18 +58,6 @@ class FingerprintConfigurationTest {
             assertThat(it.value.toProto()).isEqualTo(it.key)
         }
     }
-    @Test
-    fun `should map correctly the allowedAgeRange`() {
-        val mapping = mapOf(
-            ProtoFingerprintConfiguration.VeroGeneration.VERO_1 to FingerprintConfiguration.VeroGeneration.VERO_1,
-            ProtoFingerprintConfiguration.VeroGeneration.VERO_2 to FingerprintConfiguration.VeroGeneration.VERO_2,
-        )
-
-        mapping.forEach {
-            assertThat(it.key.toDomain()).isEqualTo(it.value)
-            assertThat(it.value.toProto()).isEqualTo(it.key)
-        }
-    }
 
     @Test
     fun `should map correctly the FingerComparisonStrategy enums`() {
diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiAgeGroupSelectionPayloadTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiGuidSelectionPayloadTest.kt
similarity index 100%
rename from infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiAgeGroupSelectionPayloadTest.kt
rename to infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/ApiGuidSelectionPayloadTest.kt