diff --git a/commons/src/main/java/net/jitse/npclib/listeners/ChunkListener.java b/commons/src/main/java/net/jitse/npclib/listeners/ChunkListener.java
index a7940e2..f72a01b 100644
--- a/commons/src/main/java/net/jitse/npclib/listeners/ChunkListener.java
+++ b/commons/src/main/java/net/jitse/npclib/listeners/ChunkListener.java
@@ -72,7 +72,7 @@ public class ChunkListener implements Listener {
 
                     // Show the NPC (if in range).
                     if (inRange) {
-                        npc.show(Bukkit.getPlayer(uuid), true);
+                        npc.show(player, true);
                     }
                 }
             }
diff --git a/commons/src/main/java/net/jitse/npclib/listeners/PacketListener.java b/commons/src/main/java/net/jitse/npclib/listeners/PacketListener.java
index 1deb175..cb07d28 100644
--- a/commons/src/main/java/net/jitse/npclib/listeners/PacketListener.java
+++ b/commons/src/main/java/net/jitse/npclib/listeners/PacketListener.java
@@ -61,11 +61,11 @@ public class PacketListener {
 
                     UUID uuid = player.getUniqueId();
                     delay.add(uuid);
-                    Bukkit.getScheduler().runTaskLater(plugin, () -> delay.remove(uuid), 1);
+                    Bukkit.getScheduler().runTask(plugin, () -> delay.remove(uuid));
                     return null;
-                } else {
-                    return super.onPacketInAsync(player, channel, packet);
                 }
+
+                return super.onPacketInAsync(player, channel, packet);
             }
         };
     }