diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 716b27cbcbd..8c992b2311e 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -215,14 +215,17 @@
 	set category = "Object"
 	set src in usr
 
+	if(!istype(src.loc,/mob/living)) return
+
 	if(!helmet)
 		usr << "There is no helmet installed."
 		return
 
 	var/mob/living/carbon/human/H = usr
-	if(!istype(H)) return
 
+	if(!istype(H)) return
 	if(H.stat) return
+	if(H.wear_suit != src) return
 
 	if(H.head == helmet)
 		helmet.canremove = 1