diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index ea37283e5..107551bff 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -541,9 +541,12 @@ scene::ISceneNode* IrrDriver::addWaterNode(scene::IMesh *mesh,
                                            float wave_speed,
                                            float wave_length)
 {
-    return m_scene_manager->addWaterSurfaceSceneNode(mesh,
+    mesh->setMaterialFlag(EMF_GOURAUD_SHADING, true);
+    scene::ISceneNode* out = m_scene_manager->addWaterSurfaceSceneNode(mesh,
                                                      wave_height, wave_speed,
                                                      wave_length);
+    out->getMaterial(0).setFlag(EMF_GOURAUD_SHADING, true);
+    return out;
 }   // addWaterNode
 
 // ----------------------------------------------------------------------------
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index e3d9203f5..a62bc3ac0 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1022,6 +1022,8 @@ void Track::createWater(const XMLNode &node)
     scene_node->setRotation(hpr);
     m_all_nodes.push_back(scene_node);
     handleAnimatedTextures(scene_node, node);
+    
+    scene_node->getMaterial(0).setFlag(video::EMF_GOURAUD_SHADING, true);
 }   // createWater
 
 // ----------------------------------------------------------------------------