diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index 9301c31d3ea..789e6e1d207 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -84,20 +84,17 @@ private void CopyLightSettings(Entity<LightBehaviourComponent> entity, string pr
     public void StartLightBehaviour(Entity<LightBehaviourComponent> entity, string id = "")
     {
         if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation))
-        {
             return;
-        }
+
         foreach (var container in entity.Comp.Animations)
         {
-            if (container.LightBehaviour.ID == id || id == string.Empty)
-            {
-                if (!_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
-                {
-                    CopyLightSettings(entity, container.LightBehaviour.Property);
-                    container.LightBehaviour.UpdatePlaybackValues(container.Animation);
-                    _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key);
-                }
-            }
+            if (container.LightBehaviour.ID != id || id != string.Empty
+                || _player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                continue;
+                
+            CopyLightSettings(entity, container.LightBehaviour.Property);
+            container.LightBehaviour.UpdatePlaybackValues(container.Animation);
+            _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key);
         }
     }
     /// <summary>
@@ -118,17 +115,14 @@ public void StopLightBehaviour(Entity<LightBehaviourComponent> entity, string id
         var toRemove = new List<LightBehaviourComponent.AnimationContainer>();
         foreach (var container in comp.Animations)
         {
-            if (container.LightBehaviour.ID == id || id == string.Empty)
-            {
-                if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
-                {
-                    _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key);
-                }
-                if (removeBehaviour)
-                {
-                    toRemove.Add(container);
-                }
-            }
+            if (container.LightBehaviour.ID != id || id != string.Empty)
+                continue;
+
+            if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key))
+                _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key);
+                    
+            if (removeBehaviour)
+                toRemove.Add(container);
         }
         foreach (var container in toRemove)
         {