diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 9c6e8337a..da55d2d63 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1798,10 +1798,7 @@ void IrrDriver::setAmbientLight(const video::SColorf &light)
     m_spherical_harmonics->setAmbientLight(light.toSColor());
     //TODO!
         
-    //if(m_spherical_harmonics == NULL) 
-    //    m_spherical_harmonics = new SphericalHarmonics(light.toSColor());
-    
-    //m_skybox_ready = false;
+
 }   // setAmbientLight
 
 video::SColorf IrrDriver::getAmbientLight() const
@@ -2382,7 +2379,7 @@ void IrrDriver::RTTProvider::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh,
         }
     }
 
-    irr_driver->setAmbientLight(video::SColor(255, 35, 35, 35) );
+    irr_driver->getSceneManager()->setAmbientLight(video::SColor(255, 35, 35, 35) );
     
     const core::vector3df &spot_pos = core::vector3df(0, 30, 40);
     m_light = irr_driver->getSceneManager()
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 3912cac96..fb6f68c57 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1824,6 +1824,12 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
     }
     m_track_object_manager->enableFog(m_use_fog);
 
+    // ---- Set ambient color
+    // We need to define ambient color before adding Skybox because we will use
+    // ambient light if the track do not have spherical harmonics textures.
+    m_ambient_color = m_default_ambient_color;
+    irr_driver->getSceneManager()->setAmbientLight(m_ambient_color);
+    
     // Sky dome and boxes support
     // --------------------------
     irr_driver->suppressSkyBox();
@@ -1854,6 +1860,8 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
             m_all_nodes.push_back(irr_driver->addSkyBox(m_sky_textures, m_spherical_harmonics_textures));
         //else
         //    m_all_nodes.push_back(irr_driver->addSkyBox(m_sky_textures, m_sky_textures));
+        if (m_spherical_harmonics_textures.size() != 6)
+            irr_driver->getSphericalHarmonics()->setAmbientLight(m_ambient_color);
     }
     else if(m_sky_type==SKY_COLOR)
     {
@@ -1869,10 +1877,6 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
     file_manager->popTextureSearchPath();
     file_manager->popModelSearchPath  ();
 
-    // ---- Set ambient color
-    m_ambient_color = m_default_ambient_color;
-    irr_driver->setAmbientLight(m_ambient_color);
-
     // ---- Create sun (non-ambient directional light)
     if (m_sun_position.getLengthSQ() < 0.03f)
     {