diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
index 450a9fe2..7f5f8f35 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
@@ -61,7 +61,7 @@ public void execute(ICommandSender sender, String[] args) {
             kickPlayers = Collections.singletonList(queue.findPlayer(args[0]));
         }
 
-        if(kickPlayers.size() == 0) {
+        if(kickPlayers.isEmpty()) {
             sender.sendMessage(getMessages().getComponent("commands.kick.no-player", "PLAYER:"+args[0]));
             return;
         }
diff --git a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
index da5a21b7..bfdf2919 100644
--- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
@@ -235,6 +235,7 @@ public void onServerKick(AdaptedPlayer player, @NotNull AdaptedServer from, Comp
         AdaptedServer ideal = to.getIdealServer(player);
 
         if(ideal == null) return null;
+        if(!to.isJoinable(player)) return null;
         if(!ideal.isJoinable(player)) return null;
         if(!(!main.getConfig().getBoolean("require-queueserver-permission") || player.hasPermission("ajqueue.queueserver." + to.getName()))) return null;