diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 7bafd60d7e..b3f2302994 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Stunnable;
+using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
@@ -62,7 +63,7 @@ namespace Content.Server.Atmos.EntitySystems
             flammable.FireStacks += component.FireStacks;
             Ignite(otherFixture, flammable);
         }
-        
+
         private void OnInteractUsingEvent(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args)
         {
             if (args.Handled)
@@ -211,9 +212,9 @@ namespace Content.Server.Atmos.EntitySystems
                 var fireStackDelta = fireStackMod - flammable.FireStacks;
                 if (fireStackDelta > 0)
                 {
-                    AdjustFireStacks((flammable).Owner, fireStackDelta, flammable);
+                    AdjustFireStacks(flammable.Owner, fireStackDelta, flammable);
                 }
-                Ignite((flammable).Owner, flammable);
+                Ignite(flammable.Owner, flammable);
             }
             _fireEvents.Clear();
 
@@ -247,7 +248,10 @@ namespace Content.Server.Atmos.EntitySystems
                 {
                     // TODO FLAMMABLE: further balancing
                     var damageScale = Math.Min((int)flammable.FireStacks, 5);
-                    _temperatureSystem.ChangeHeat(uid, 12500 * damageScale);
+                    
+                    if(TryComp(uid, out TemperatureComponent? temp))
+                        _temperatureSystem.ChangeHeat(uid, 12500 * damageScale, false, temp);
+
                     _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale);
 
                     AdjustFireStacks(uid, -0.1f * (flammable.Resisting ? 10f : 1f), flammable);