diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 2c48d18e6e..51c62029e0 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -270,6 +270,8 @@ All ShuttleMove procs go here
 	. = ..()
 
 /mob/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+	if(!move_on_shuttle)
+		return
 	. = ..()
 	if(client && movement_force)
 		var/shake_force = max(movement_force["THROW"], movement_force["KNOCKDOWN"])