diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentDivideService.java b/src/main/java/nl/connectedit/swiss/service/TournamentDivideService.java
index a061d6b..bd5e3c1 100644
--- a/src/main/java/nl/connectedit/swiss/service/TournamentDivideService.java
+++ b/src/main/java/nl/connectedit/swiss/service/TournamentDivideService.java
@@ -35,7 +35,8 @@ public class TournamentDivideService {
     }
 
     for (var event : tournament.getEvents()) {
-      if (event.getRegistrations().size() >= 4) {
+      if ((event.getType().isDoublesEvent() && event.getRegistrations().size() >= 8)
+         || (!event.getType().isDoublesEvent() && event.getRegistrations().size() >= 4)) {
         divide(event);
       }
     }
diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentValidationService.java b/src/main/java/nl/connectedit/swiss/service/TournamentValidationService.java
index 2f59736..2b56bd9 100644
--- a/src/main/java/nl/connectedit/swiss/service/TournamentValidationService.java
+++ b/src/main/java/nl/connectedit/swiss/service/TournamentValidationService.java
@@ -65,7 +65,9 @@ public class TournamentValidationService {
     private void checkNumberOfRegistrations(Event event, List<Validation> validations) {
         if (event.getRegistrations().isEmpty()) {
             addValidation(validations, ERROR, "Geen inschrijvingen");
-        } else if (event.getRegistrations().size() < 4 ) {
+        } else if (event.getType().isDoublesEvent() && event.getRegistrations().size() < 8 ) {
+            addValidation(validations, ERROR, "Te weinig inschrijvingen");
+        } else if (!event.getType().isDoublesEvent() && event.getRegistrations().size() < 4 ) {
             addValidation(validations, ERROR, "Te weinig inschrijvingen");
         }
     }