diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 0b5dc62f51..0c04055e15 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -185,7 +185,7 @@ namespace Content.Server.Atmos.EntitySystems
             _timer -= UpdateTime;
 
             // TODO: This needs cleanup to take off the crust from TemperatureComponent and shit.
-            foreach (var (flammable, physics, transform) in EntityManager.EntityQuery<FlammableComponent, PhysicsComponent, ITransformComponent>())
+            foreach (var (flammable, physics, transform) in EntityManager.EntityQuery<FlammableComponent, IPhysBody, ITransformComponent>())
             {
                 var uid = flammable.Owner.Uid;
 
@@ -200,7 +200,7 @@ namespace Content.Server.Atmos.EntitySystems
                 if (!flammable.OnFire)
                 {
                     status?.ClearAlert(AlertType.Fire);
-                    return;
+                    continue;
                 }
 
                 status?.ShowAlert(AlertType.Fire);
@@ -221,7 +221,7 @@ namespace Content.Server.Atmos.EntitySystems
                 else
                 {
                     Extinguish(uid, flammable);
-                    return;
+                    continue;
                 }
 
                 var air = _atmosphereSystem.GetTileMixture(transform.Coordinates);
@@ -230,7 +230,7 @@ namespace Content.Server.Atmos.EntitySystems
                 if (air == null || air.GetMoles(Gas.Oxygen) < 1f)
                 {
                     Extinguish(uid, flammable);
-                    return;
+                    continue;
                 }
 
                 _atmosphereSystem.HotspotExpose(transform.Coordinates, 700f, 50f, true);
diff --git a/Resources/Changelog/Parts/fire.yml b/Resources/Changelog/Parts/fire.yml
new file mode 100644
index 0000000000..27f66256c9
--- /dev/null
+++ b/Resources/Changelog/Parts/fire.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fixes mobs being on fire permanently