diff --git a/Subsurface/Source/Map/Explosion.cs b/Subsurface/Source/Map/Explosion.cs
index ba3a750f3..f4203f939 100644
--- a/Subsurface/Source/Map/Explosion.cs
+++ b/Subsurface/Source/Map/Explosion.cs
@@ -75,12 +75,11 @@ namespace Barotrauma
 
             ApplyExplosionForces(worldPosition, attack.Range, force, attack.GetDamage(1.0f), attack.Stun);
 
-            if (flames)
+            if (flames && GameMain.Client == null)
             {
                 foreach (Item item in Item.ItemList)
                 {
                     if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;
-                    //if (item.ParentInventory != null) return;
 
                     if (Vector2.Distance(item.WorldPosition, worldPosition) > attack.Range * 0.1f) continue;
 
diff --git a/Subsurface/Source/Map/FireSource.cs b/Subsurface/Source/Map/FireSource.cs
index 44540daf4..93a583c4d 100644
--- a/Subsurface/Source/Map/FireSource.cs
+++ b/Subsurface/Source/Map/FireSource.cs
@@ -280,10 +280,8 @@ namespace Barotrauma
                 float range = (float)Math.Sqrt(size.X) * 10.0f;
                 if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue;
                 if (item.Position.Y < position.Y - size.Y || item.Position.Y > hull.Rect.Y) continue;
-
-                //item.Condition -= (float)Math.Sqrt(size.X) * deltaTime;
-
-                item.ApplyStatusEffects(ActionType.OnFire, deltaTime);
+                
+                if (GameMain.Client == null) item.ApplyStatusEffects(ActionType.OnFire, deltaTime);
             }
         }