diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
index 29b0620a..9aa57510 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
@@ -39,7 +39,7 @@ public class EventFight implements Comparable<EventFight> {
     private static final SelectStatement<EventFight> byId = table.select(Table.PRIMARY);
     private static final SelectStatement<EventFight> allComing = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE StartTime > now() ORDER BY StartTime ASC");
     private static final SelectStatement<EventFight> event = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID = ? ORDER BY StartTime ASC");
-    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE Fight IS NOT NULL AND StartTime > now() AND DATEDIFF(StartTime, now()) < 0");
+    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE Fight IS NOT NULL AND StartTime < now() AND DATEDIFF(StartTime, now()) < 0");
     private static final Statement reschedule = table.update(Table.PRIMARY, "StartTime");
     private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
     private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
index 2c319b72..4fb59b62 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
@@ -37,6 +37,7 @@ public class CookieEvents extends BasicListener {
 
             EventFight.getActiveFights().stream()
                     .filter(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())
+                    .filter(fight -> fight.getSpectatePort() != null)
                     .filter(fight -> fight.getSpectatePort() != 0)
                     .findFirst()
                     .flatMap(fight -> VelocityCore.getProxy().getServer(EventStarter.getSpectatePorts().get(fight.getSpectatePort())))