diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1831b983f2c..ed0092cf60d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -65,7 +65,10 @@
 /obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
 	loc.Exited(M)
 	M.loc = destination
-	loc.Entered(M, ignoreRest = 1)
+	if(isturf(loc))
+		loc.Entered(M, src, ignoreRest = 1)
+	else
+		loc.Entered(M, src)
 	for(var/atom/movable/AM in loc)
 		if(istype(AM, /obj/item))
 			continue