diff --git a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java
index ed33265..61f785d 100644
--- a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java
+++ b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java
@@ -123,7 +123,7 @@ public class ParticipantService {
                 if (defenses != null && !defenses.isEmpty()) {
                     defense = defenses.get(0);
                 }
-                if (defense != null) {
+                if (defense != null && defense.isStateShouldBeProcessed(Defense.Status.TOPIC_CHOOSING)) {
                     taskService.checkAndCreateTopicChoosingTasksAndSendEmail(Collections.singletonList(studentData), defense);
                 }
             }