diff --git a/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java
index 45206bec..96085b24 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java
@@ -56,10 +56,12 @@ public class CarryAbility implements Ability<Hit> {
         PlayerEntity player = iplayer.getMaster();
         LivingEntity rider = findRider(player, iplayer.getWorld());
 
+        if (player.hasPassengers()) {
+            player.removeAllPassengers();
+        }
+
         if (rider != null) {
             rider.startRiding(player, true);
-        } else {
-            player.removeAllPassengers();
         }
 
         if (player instanceof ServerPlayerEntity) {