diff --git a/mods/ENVIRONMENT/mcl_weather/init.lua b/mods/ENVIRONMENT/mcl_weather/init.lua
index efaafd5b..2ed5d154 100644
--- a/mods/ENVIRONMENT/mcl_weather/init.lua
+++ b/mods/ENVIRONMENT/mcl_weather/init.lua
@@ -218,8 +218,12 @@ end
 function mcl_weather.change_player(name,new)
 	if players.weather[name] ~= new then
 		local nd = mcl_weather.get_weatherdef(new)
+		local od=mcl_weather.get_weatherdef(mcl_weather.current)
+		if players.weather[name] ~= nil then
+			od=mcl_weather.get_weatherdef(players.weather[name])
+		end
 		if nd then
-			mcl_weather.stop_weather_player(name,mcl_weather.get_weatherdef(mcl_weather.current))
+			mcl_weather.stop_weather_player(name,od)
 			mcl_weather.start_weather_player(name,nd)		
 			players.weather[name] = new
 		end