diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 866b0a5be92..b797d6d03e9 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -630,7 +630,7 @@
 					L.gib()
 
 			// Move unanchored atoms
-			if(!AM.anchored)
+			if(!AM.anchored && !ismob(AM))
 				step(AM, dir)
 			else
 				if(AM.simulated) // Don't qdel lighting overlays, they are static