diff --git a/core/src/main/java/tc/oc/pgm/join/JoinMatchModule.java b/core/src/main/java/tc/oc/pgm/join/JoinMatchModule.java
index 37d9574e83..96578d0966 100644
--- a/core/src/main/java/tc/oc/pgm/join/JoinMatchModule.java
+++ b/core/src/main/java/tc/oc/pgm/join/JoinMatchModule.java
@@ -80,6 +80,11 @@ public boolean priorityKickAllowed() {
     return getConfig().canPriorityKick() && !match.isRunning();
   }
 
+  public boolean canPriorityKick(MatchPlayer player) {
+    JoinRequest request = requests.get(player.getBukkit());
+    return request != null && canPriorityKick(request);
+  }
+
   public boolean canPriorityKick(JoinRequest request) {
     return priorityKickAllowed() && request.isForcedOr(JoinRequest.Flag.JOIN_FULL);
   }
diff --git a/core/src/main/java/tc/oc/pgm/teams/TeamMatchModule.java b/core/src/main/java/tc/oc/pgm/teams/TeamMatchModule.java
index 6fab20c7bd..460bf8575d 100644
--- a/core/src/main/java/tc/oc/pgm/teams/TeamMatchModule.java
+++ b/core/src/main/java/tc/oc/pgm/teams/TeamMatchModule.java
@@ -526,7 +526,7 @@ public boolean kickPlayerOffTeam(Team kickFrom, boolean forBalance) {
     }
 
     // Give them the bad news
-    if (jmm.canBePriorityKicked(kickMe)) {
+    if (jmm.canPriorityKick(kickMe)) {
       kickMe.sendMessage(translatable("join.ok.moved", kickTo.getName()));
       kickMe.sendMessage(translatable("join.ok.moved.explanation"));
     } else {