diff --git a/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
index ca7641083..3f23b8e95 100644
--- a/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
@@ -287,7 +287,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
         boolean navigating = npc.getNavigator().isNavigating();
         updatePackets(navigating);
-        if (npc.getTrait(Gravity.class).hasGravity() && !navigating && getBukkitEntity() != null
+        if (!navigating && getBukkitEntity() != null && npc.getTrait(Gravity.class).hasGravity()
                 && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))) {
             g(0, 0);
         }
diff --git a/src/main/java/net/citizensnpcs/trait/Gravity.java b/src/main/java/net/citizensnpcs/trait/Gravity.java
index 4a151b545..98fbd9063 100644
--- a/src/main/java/net/citizensnpcs/trait/Gravity.java
+++ b/src/main/java/net/citizensnpcs/trait/Gravity.java
@@ -1,6 +1,5 @@
 package net.citizensnpcs.trait;
 
-import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.persistence.Persist;
@@ -28,9 +27,6 @@ public class Gravity extends Trait implements Toggleable {
     public void run() {
         if (!npc.isSpawned())
             return;
-        if (npc.getEntity() instanceof Player) {
-            return;
-        }
         if (!enabled || npc.getNavigator().isNavigating())
             return;
         Vector vector = npc.getEntity().getVelocity();