diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 26f5da36f..1bf0d6ad4 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -851,6 +851,10 @@ namespace UserConfigParams
             PARAM_DEFAULT(BoolUserConfigParam(false,
                            "ssao", &m_graphics_quality,
                            "Enable Screen Space Ambient Occlusion") );
+    PARAM_PREFIX BoolUserConfigParam         m_light_scatter
+            PARAM_DEFAULT(BoolUserConfigParam(true,
+                           "light_scatter", &m_graphics_quality,
+                           "Enable light scattering shaders") );
     PARAM_PREFIX IntUserConfigParam          m_shadows_resolution
             PARAM_DEFAULT( IntUserConfigParam(0,
                            "shadows_resolution", &m_graphics_quality,
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index c7513de9d..8035b904a 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -295,9 +295,9 @@ void ShaderBasedRenderer::renderSceneDeferred(scene::ICameraSceneNode * const ca
 
     const Track * const track = Track::getCurrentTrack();
     // Render discrete lights scattering
-    if (track && track->isFogEnabled())
+    if (UserConfigParams::m_light_scatter && track && track->isFogEnabled())
     {
-        PROFILER_PUSH_CPU_MARKER("- PointLight Scatter", 0xFF, 0x00, 0x00);
+        PROFILER_PUSH_CPU_MARKER("- Light Scatter", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_LIGHTSCATTER));
         m_lighting_passes.renderLightsScatter(m_rtts->getDepthStencilTexture(),
                                               m_rtts->getFBO(FBO_HALF1),
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index a4baea43e..3ba72b2dd 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -970,7 +970,7 @@ void World::scheduleTutorial()
 //-----------------------------------------------------------------------------
 /** This updates all only graphical elements. It is only called once per
  *  rendered frame, not once per time step.
- *  float dt Time since last rame.
+ *  float dt Time since last frame.
  */
 void World::updateGraphics(float dt)
 {