diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp
index bd5112f99..4547ea591 100644
--- a/code/ryzom/client/src/main_loop.cpp
+++ b/code/ryzom/client/src/main_loop.cpp
@@ -688,22 +688,26 @@ void updateWeather()
 	}
 	#endif
 	
-	// FIXME: temporary fix for teleportation crash
 	// Update new sky
-	if (ContinentMngr.cur() && Driver->getPolygonMode() == UDriver::Filled && Filter3D[FilterSky])
+	if (ContinentMngr.cur() && !ContinentMngr.cur()->Indoor)
 	{
-		CSky &sky = ContinentMngr.cur()->CurrentSky;
-
-		if (!ContinentMngr.cur()->Indoor && sky.getScene())
+		if(Driver->getPolygonMode() == UDriver::Filled)
 		{
-			s_SkyMode = NewSky;
-			sky.getScene()->animate(TimeInSec-FirstTimeInSec);
-			// Setup the sky camera
-			preRenderNewSky();
-		}
-		else
-		{
-			s_SkyMode = OldSky;
+			if (Filter3D[FilterSky])
+			{
+				CSky &sky = ContinentMngr.cur()->CurrentSky;
+				if (sky.getScene())
+				{
+					s_SkyMode = NewSky;
+					sky.getScene()->animate(TimeInSec-FirstTimeInSec);
+					// Setup the sky camera
+					preRenderNewSky();
+				}
+				else
+				{
+					s_SkyMode = OldSky;
+				}
+			}
 		}
 	}
 }