diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 2c45213ec44..5634bb8dfe5 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -224,7 +224,7 @@
 	return
 
 /obj/structure/closet/relaymove(mob/user as mob)
-	if(user.stat)
+	if(user.stat || !isturf(src.loc))
 		return
 
 	if(!src.open())
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index aca03793d9d..5701501eedd 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -99,11 +99,9 @@
 			togglelock(user)
 
 /obj/structure/closet/secure_closet/relaymove(mob/user as mob)
-	if(user.stat)
+	if(user.stat || !isturf(src.loc))
 		return
 
-	if(user.stat)
-		return
 	if(!(src.locked))
 		for(var/obj/item/I in src)
 			I.loc = src.loc