diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
index 9325fe9db..710ef0219 100644
--- a/main/src/main/java/net/citizensnpcs/EventListen.java
+++ b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -12,6 +12,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FishHook;
+import org.bukkit.entity.Horse;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -503,7 +504,7 @@ public void onVehicleEnter(VehicleEnterEvent event) {
         if (!npcRegistry.isNPC(event.getEntered()))
             return;
         NPC npc = npcRegistry.getNPC(event.getEntered());
-        if ((npc.getEntity().getType() == EntityType.HORSE || npc.getEntity().getType() == EntityType.BOAT
+        if ((npc.getEntity() instanceof Horse || npc.getEntity().getType() == EntityType.BOAT
                 || npc.getEntity() instanceof Minecart) && !npc.getTrait(Controllable.class).isEnabled()) {
             event.setCancelled(true);
         }