diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index bfbfe5cf..95ff93e9 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -1043,6 +1043,12 @@ class WorldSessionActor extends Actor with MDCContextAware {
 
     case VehicleSpawnPad.StartPlayerSeatedInVehicle(vehicle, pad) =>
       val vehicle_guid = vehicle.GUID
+      PlayerActionsToCancel()
+      if(player.VisibleSlots.contains(player.DrawnSlot)) {
+        player.DrawnSlot = Player.HandsDownSlot
+        sendResponse(ObjectHeldMessage(player.GUID, Player.HandsDownSlot, true))
+        avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectHeld(player.GUID, player.LastDrawnSlot))
+      }
       sendResponse(PlanetsideAttributeMessage(vehicle_guid, 22, 1L)) //mount points off?
       sendResponse(PlanetsideAttributeMessage(vehicle_guid, 21, player.GUID.guid)) //fte and ownership?
 
@@ -3841,11 +3847,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
         shooting = None
       case None => ;
     }
-    if(player != null && player.isAlive && player.VisibleSlots.contains(player.DrawnSlot)) {
-      player.DrawnSlot = Player.HandsDownSlot
-      sendResponse(ObjectHeldMessage(player.GUID, Player.HandsDownSlot, true))
-      avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectHeld(player.GUID, player.LastDrawnSlot))
-    }
     if(flying) {
       sendResponse(ChatMsg(ChatMessageType.CMT_FLY, false, "", "off", None))
       flying = false