diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
index f4fefa5cb..b78b772dd 100644
--- a/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -486,7 +486,8 @@ public class NMS {
     }
 
     public static Entity getVehicle(org.bukkit.entity.Entity entity) {
-        return getHandle(entity).getVehicle();
+        Entity e = getHandle(entity).getVehicle();
+        return e == getHandle(entity) ? null : e;
     }
 
     public static void initNetworkManager(NetworkManager network) {