diff --git a/Subsurface/Source/Map/FireSource.cs b/Subsurface/Source/Map/FireSource.cs
index c0948a07e..f735dde1a 100644
--- a/Subsurface/Source/Map/FireSource.cs
+++ b/Subsurface/Source/Map/FireSource.cs
@@ -344,8 +344,16 @@ namespace Barotrauma
 
             lightSource.Remove();
 
-            if (basicSoundIndex > -1) Sounds.SoundManager.Stop(basicSoundIndex);
-            if (largeSoundIndex > -1) Sounds.SoundManager.Stop(largeSoundIndex);
+            if (basicSoundIndex > -1)
+            {
+                Sounds.SoundManager.Stop(basicSoundIndex);
+                basicSoundIndex = -1;
+            }
+            if (largeSoundIndex > -1)
+            {
+                Sounds.SoundManager.Stop(largeSoundIndex);
+                largeSoundIndex = -1;
+            }
 
             hull.RemoveFire(this);
         }