diff --git a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
index 56ed122..ca93ff0 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
@@ -7,6 +7,7 @@ import org.bukkit.World;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scoreboard.Team;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.OptionalDouble;
@@ -26,14 +27,9 @@ public class EventRunner implements Runnable {
         long lastRunDay = world.getPersistentDataContainer().get(eventKey, PersistentDataType.LONG);
         day = Bukkit.getWorld("world").getFullTime() / 24000;
 
-        if (day > lastRunDay && !currentEvents.isEmpty()) {
-            for (Event event : currentEvents) {
-                event.eventTimeEnded();
-            }
-
-            // When event doesn't properly handle eventTimeEnded
-            for (Event event : currentEvents) {
-                event.eventFailed();
+        if (day > lastRunDay) {
+            while (!currentEvents.isEmpty()) {
+                currentEvents.getFirst().eventTimeEnded();
             }
         }