diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index cffe8415bf..e468d82d56 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -243,8 +243,10 @@ public class Logic implements ApplicationListener{
     }
 
     private void updateWeather(){
+        state.rules.weather.removeAll(w -> w.weather == null);
 
         for(WeatherEntry entry : state.rules.weather){
+            if(entry.weather == null) continue;
             //update cooldown
             entry.cooldown -= Time.delta;