diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index f90996fc..62c7a870 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 public class FightEndsHandler implements SpigotHandler {
 
     private int K = 20;
-    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 30 /* Minutes */;
+    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
 
     @Override
     public void handle(ByteArrayDataInput in, ServerInfo info) {