diff --git a/P3D/Overworld/OverworldScreen.vb b/P3D/Overworld/OverworldScreen.vb
index 31499dd91..9647c0ca3 100644
--- a/P3D/Overworld/OverworldScreen.vb
+++ b/P3D/Overworld/OverworldScreen.vb
@@ -139,10 +139,11 @@ Public Class OverworldScreen
         'Load the particle texture.
         Me._particlesTexture = TextureManager.GetTexture("GUI\Overworld\Particles")
 
-        ' start watching files for changes
-#If DEBUG Then
-        DebugFileWatcher.StartWatching()
-#End If
+        If GameController.IS_DEBUG_ACTIVE Then
+            ' start watching files for changes
+            DebugFileWatcher.StartWatching()
+        End If
+
     End Sub
 
     ''' <summary>
diff --git a/P3D/World/Level.vb b/P3D/World/Level.vb
index 714370411..debf1c0d0 100644
--- a/P3D/World/Level.vb
+++ b/P3D/World/Level.vb
@@ -700,9 +700,9 @@ Public Class Level
     Public Sub Load(ByVal Levelpath As String)
 
         ' copy all changed files
-#If DEBUG Then
-        DebugFileWatcher.TriggerReload()
-#End If
+        If GameController.IS_DEBUG_ACTIVE Then
+            DebugFileWatcher.TriggerReload()
+        End If
 
         ' Create a parameter array to pass over to the LevelLoader:
         Dim params As New List(Of Object)