diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index 521910e5b..a1c1ace9b 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -125,8 +125,7 @@ public class PlayerListener implements Listener {
         if (event.getResult() == Result.ALLOWED) {
             Player player = event.getPlayer();
 
-            /* We can't use the other check here because a profile hasn't been created yet.*/
-            if (player == null || player.hasMetadata("NPC")) {
+            if (Misc.isNPCPlayer(player)) {
                 return;
             }