diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ElectricalDischarger.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ElectricalDischarger.cs
index 501491c11..001155e91 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ElectricalDischarger.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ElectricalDischarger.cs
@@ -34,6 +34,20 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public override bool IsActive
+        {
+            get { return base.IsActive; }
+            set
+            {
+                base.IsActive = value;
+                if (!value)
+                {
+                    nodes.Clear();
+                    charactersInRange.Clear();
+                }
+            }
+        }
+
         [Serialize(100.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 5000.0f)]
         public float Range
         {
@@ -126,14 +140,19 @@ namespace Barotrauma.Items.Components
             }
             else
             {
-                nodes.Clear();
-                charactersInRange.Clear();
                 IsActive = false;
             }
 
             voltage = 0.0f;
         }
 
+        public override void UpdateBroken(float deltaTime, Camera cam)
+        {
+            base.UpdateBroken(deltaTime, cam);
+            nodes.Clear();
+            charactersInRange.Clear();
+        }
+
         private void Discharge()
         {
             ApplyStatusEffects(ActionType.OnUse, 1.0f);