diff --git a/code/controllers/subsystems/stationheater.dm b/code/controllers/subsystems/stationheater.dm
index 53b8ad8957e..8c038b48fc5 100644
--- a/code/controllers/subsystems/stationheater.dm
+++ b/code/controllers/subsystems/stationheater.dm
@@ -60,11 +60,8 @@ SUBSYSTEM_DEF(stationheater)
 
 	// Update radiator icon if the main boiler is functioning or not
 	radiator.set_state(assigned_boiler?.is_heating())
-	radiator.update_icon()
-
-	// Remove us if we are in an invalid radiator turf
 	var/turf/radiator_turf = get_turf(radiator)
-	if(!SScryoplanets.is_station_temp_change_turf(radiator_turf))
+	if(!radiator.get_radiating() || !SScryoplanets.is_station_temp_change_turf(radiator_turf))
 		return
 
 	// If the temp is colder than the radiator, begin heating!
diff --git a/code/game/machinery/atmoalter/station_boiler_radiator.dm b/code/game/machinery/atmoalter/station_boiler_radiator.dm
index 7ec62a3a546..b446592c3fc 100644
--- a/code/game/machinery/atmoalter/station_boiler_radiator.dm
+++ b/code/game/machinery/atmoalter/station_boiler_radiator.dm
@@ -27,7 +27,10 @@
 		return
 	actively_radiating = activate
 	update_icon()
-	set_light(1, 0.9, "#e9400dff", l_on = actively_radiating)
+	set_light(actively_radiating, 0.9, "#e9400dff")
+
+/obj/machinery/stationboiler_radiator/proc/get_radiating()
+	return actively_radiating
 
 /obj/machinery/stationboiler_radiator/update_icon()
 	icon_state = actively_radiating ? "on" : "off"