diff --git a/code/datums/components/fov_handler.dm b/code/datums/components/fov_handler.dm
index 9335711fa8c..0390357aced 100644
--- a/code/datums/components/fov_handler.dm
+++ b/code/datums/components/fov_handler.dm
@@ -97,13 +97,15 @@
 /datum/component/fov_handler/proc/remove_mask()
 	var/mob/parent_mob = parent
 	var/client/parent_client = parent_mob.client
+	// Prevents stupid ass hard deletes
+	parent_mob.hud_used.always_visible_inventory -= blocker_mask
+	parent_mob.hud_used.always_visible_inventory -= visual_shadow
 	if(!parent_client) //Love client volatility!!
 		return
 	applied_mask = FALSE
 	parent_client.screen -= blocker_mask
 	parent_client.screen -= visual_shadow
-	parent_mob.hud_used.always_visible_inventory -= blocker_mask
-	parent_mob.hud_used.always_visible_inventory -= visual_shadow
+
 
 /datum/component/fov_handler/proc/add_mask()
 	var/mob/parent_mob = parent