diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index ff60c2be000..3fab0c1ae1d 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -335,6 +335,8 @@
 						wearer << "<span class='danger'>The suit optics drop out completely, drowning you in darkness.</span>"
 		if(!offline)
 			offline = 1
+			if(istype(wearer) && wearer.wearing_rig)
+				wearer.wearing_rig = null
 	else
 		if(offline)
 			offline = 0
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 99e77bf7bd2..611362f1954 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -63,10 +63,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	// update the current life tick, can be used to e.g. only do something every 4 ticks
 	life_tick++
 
-	// This is not an ideal place for this but it will do for now.
-	if(wearing_rig && wearing_rig.offline)
-		wearing_rig = null
-
 	var/datum/gas_mixture/environment = loc.return_air()
 
 	in_stasis = 0