diff --git a/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java b/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java
index f7c5c112..8984c669 100644
--- a/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java
+++ b/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java
@@ -44,7 +44,10 @@ private void updatePlayerWeather(Player player, @Nullable WeatherType value) {
 
     @Override
     protected void onInitialValue(Player player, ApplicableRegionSet set, WeatherType value) {
-        initialWeather = player.getPlayerWeather();
+        if (value == null) {
+            initialWeather = null;
+            return;
+        }
         updatePlayerWeather(player, value);
     }