diff --git a/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java b/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java
index fde39caad..dde4150c7 100644
--- a/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java
+++ b/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java
@@ -493,7 +493,10 @@ public PublicEnrollmentDTO createEnrollmentToQueue(
     );
 
     if (freeEnrollmentDetails != null && freeEnrollment != null) {
-      if (freeEnrollmentDetails.textualSkillCount() == 0 || freeEnrollmentDetails.oralSkillCount() == 0) {
+      if (
+        EnrollmentUtil.getFreeExamsLeft(freeEnrollmentDetails.textualSkillCount()) == 0 ||
+        EnrollmentUtil.getFreeExamsLeft(freeEnrollmentDetails.oralSkillCount()) == 0
+      ) {
         publicEnrollmentEmailService.sendPartiallyFreeEnrollmentToQueueConfirmationEmail(
           enrollment,
           person,