diff --git a/server/src/main/java/ru/mskobaro/tdms/business/service/DefenseService.java b/server/src/main/java/ru/mskobaro/tdms/business/service/DefenseService.java
index 8db2e30..6e7e21c 100644
--- a/server/src/main/java/ru/mskobaro/tdms/business/service/DefenseService.java
+++ b/server/src/main/java/ru/mskobaro/tdms/business/service/DefenseService.java
@@ -298,7 +298,17 @@ public class DefenseService {
                 ))
                 .toList();
 
-        final int maxInDay = 16;
+        int maxInDay  = 16;
+
+        int size = students.size();
+        for (int i = 1; i < 10; i++) {
+            int inDay = size / i;
+            if (inDay <= maxInDay) {
+                maxInDay = inDay;
+                break;
+            }
+        }
+
         int currentDay = 1;
         int currentOrder = 1;
         for (StudentData student : students) {