diff --git a/internal/SceneCPU.cpp b/internal/SceneCPU.cpp
index d5cbd851..09519580 100644
--- a/internal/SceneCPU.cpp
+++ b/internal/SceneCPU.cpp
@@ -892,8 +892,9 @@ void Ray::Cpu::Scene::Finalize(const std::function<void(int, int, ParallelForFun
 
     if (env_.env_map != InvalidTextureHandle._index &&
         (env_.env_map == PhysicalSkyTexture._index || env_.env_map == physical_sky_texture_._index)) {
-        PrepareSkyEnvMap_nolock(parallel_for);
+        env_.env_map_rotation = 0.0f;
         env_.sky_map_spread_angle = 2 * PI / float(env_.envmap_resolution);
+        PrepareSkyEnvMap_nolock(parallel_for);
     }
 
     if (env_.importance_sample && env_.env_col[0] > 0.0f && env_.env_col[1] > 0.0f && env_.env_col[2] > 0.0f) {
diff --git a/internal/SceneGPU.h b/internal/SceneGPU.h
index 74fb84ad..75273cc4 100644
--- a/internal/SceneGPU.h
+++ b/internal/SceneGPU.h
@@ -1488,6 +1488,7 @@ inline void Ray::NS::Scene::Finalize(const std::function<void(int, int, Parallel
 
     if (env_.env_map != InvalidTextureHandle._index &&
         (env_.env_map == PhysicalSkyTexture._index || env_.env_map == physical_sky_texture_._index)) {
+        env_.env_map_rotation = 0.0f;
         env_.sky_map_spread_angle = 2 * PI / float(env_.envmap_resolution);
         if (!atmosphere_params_buf_) {
             atmosphere_params_buf_ = Buffer{"Atmosphere Params", ctx_, eBufType::Uniform, sizeof(atmosphere_params_t)};