diff --git a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
index 0b21cef1..2a5f85f7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
@@ -55,7 +55,9 @@ public class EventStarter {
     }
 
     private void run() {
-        eventServer.entrySet().removeIf(entry -> Subserver.getSubserver(entry.getValue().getServer()) == null);
+        if (eventServer.entrySet().removeIf(entry -> Subserver.getSubserver(entry.getValue().getServer()) == null)) {
+            EventFight.loadAllComingFights();
+        }
         Queue<EventFight> fights = EventFight.getFights();
 
         EventFight next;