diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 047cdd575e..906acdd4b5 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -341,7 +341,7 @@ public class Control implements ApplicationListener, Loadable{
                         state.rules.waves = true;
 
                         //reset win wave??
-                        state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40;
+                        state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40;
 
                         //if there's still an enemy base left, fix it
                         if(state.rules.attackMode){
diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java
index deb2ed4688..6a15c50e96 100644
--- a/core/src/mindustry/game/SectorInfo.java
+++ b/core/src/mindustry/game/SectorInfo.java
@@ -130,7 +130,7 @@ public class SectorInfo{
         }
 
         //if there are infinite waves and no win wave, add a win wave.
-        if(waves && winWave <= 0 && !attack){
+        if(winWave <= 0 && !attack){
             winWave = 30;
         }