diff --git a/src/main/java/main/service/StopGiveawayService.java b/src/main/java/main/service/StopGiveawayService.java
index 5b2a35d..7321ac0 100644
--- a/src/main/java/main/service/StopGiveawayService.java
+++ b/src/main/java/main/service/StopGiveawayService.java
@@ -41,6 +41,9 @@ public void stop() {
                         if (!lockEnd && now.after(endGiveawayDate)) {
                             LOGGER.info(logMessage);
                             giveaway.stopGiveaway(countWinners);
+                        } else if (finishGiveaway) {
+                            LOGGER.info(logMessage);
+                            giveaway.stopGiveaway(countWinners);
                         }
                     }
                 } catch (Exception e) {