diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 389a2406ed..1979ca1c3b 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -32,7 +32,8 @@ All shuttleRotate procs go here
 
 //override to avoid rotating pixel_xy on mobs
 /mob/shuttleRotate(rotation)
-	setDir(angle2dir(rotation+dir2angle(dir)))
+	if(!buckled)
+		setDir(angle2dir(rotation+dir2angle(dir)))
 
 /************************************Structure rotate procs************************************/