diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index b8bd588c4b..1b324459a5 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -658,9 +658,15 @@ void SkyManager::setWeather(const MWWorld::WeatherResult& weather)
 
     if (weather.mNight && mStarsOpacity != weather.mNightFade)
     {
-        for (int i=0; i<7; ++i)
-            mStarsMaterials[i]->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, weather.mNightFade);
-        mStarsOpacity = weather.mNightFade;
+        if (weather.mNightFade == 0)
+            mAtmosphereNight->setVisible(false);
+        else
+        {
+            mAtmosphereNight->setVisible(true);
+            for (int i=0; i<7; ++i)
+                mStarsMaterials[i]->getTechnique(0)->getPass(0)->setDiffuse(0.0, 0.0, 0.0, weather.mNightFade);
+            mStarsOpacity = weather.mNightFade;
+        }
     }
 
     float strength;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 7cb9f3dfc6..059b0ec1e2 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -758,7 +758,7 @@ unsigned int WeatherManager::getWeatherID() const
         return 3;
     else if (mCurrentWeather == "rain")
         return 4;
-    else if (mCurrentWeather == "thunder")
+    else if (mCurrentWeather == "thunderstorm")
         return 5;
     else if (mCurrentWeather == "ashstorm")
         return 6;
@@ -787,7 +787,7 @@ void WeatherManager::changeWeather(const std::string& region, const unsigned int
     else if (id==4)
         weather = "rain";
     else if (id==5)
-        weather = "thunder";
+        weather = "thunderstorm";
     else if (id==6)
         weather = "ashstorm";
     else if (id==7)