diff --git a/pom.xml b/pom.xml
index 538eee6..82d1d23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.yescallop.essentialsnk</groupId>
     <artifactId>essentialsnk</artifactId>
-    <version>1.9.2-IGN.23</version>
+    <version>1.9.2-IGN.24</version>
 
     <name>EssentialsNK</name>
     <description>Essential commands for your server</description>
diff --git a/src/main/java/cn/yescallop/essentialsnk/EssentialsAPI.java b/src/main/java/cn/yescallop/essentialsnk/EssentialsAPI.java
index a74ec8f..ed90eea 100644
--- a/src/main/java/cn/yescallop/essentialsnk/EssentialsAPI.java
+++ b/src/main/java/cn/yescallop/essentialsnk/EssentialsAPI.java
@@ -48,7 +48,7 @@ public class EssentialsAPI {
     private final List<TPCooldown> tpCooldowns = new ArrayList<>();
     private final Map<Player, Location> playerLastLocation = new ConcurrentHashMap<>();
     private final Map<Integer, TPRequest> tpRequests = new ConcurrentHashMap<>();
-    private final Set<String> vanishedPlayers = ConcurrentHashMap.newKeySet();
+    final Set<String> vanishedPlayers = ConcurrentHashMap.newKeySet();
     private final Map<String, String> lastMessagedPlayers = new ConcurrentHashMap<>();
 
     private final ConfigType homeConfig = null;
@@ -304,6 +304,9 @@ public void removeTPRequestBetween(Player from, Player to) {
     }
 
     public void removeTPRequest(Player player) {
+        if (this.tpRequests.isEmpty()) {
+            return;
+        }
         this.tpRequests.values().removeIf(request -> request.getSender() == player || request.getRecipient() == player);
     }
 
diff --git a/src/main/java/cn/yescallop/essentialsnk/EventListener.java b/src/main/java/cn/yescallop/essentialsnk/EventListener.java
index d2bc102..dd0b16e 100644
--- a/src/main/java/cn/yescallop/essentialsnk/EventListener.java
+++ b/src/main/java/cn/yescallop/essentialsnk/EventListener.java
@@ -29,6 +29,9 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         boolean vanished = api.isVanished(player);
+        if (!vanished && EssentialsAPI.getInstance().vanishedPlayers.isEmpty()) {
+            return;
+        }
         for (Player p : api.getServer().getOnlinePlayers().values()) {
             if (api.isVanished(p)) {
                 player.hidePlayer(p);
diff --git a/src/main/java/cn/yescallop/essentialsnk/command/CommandManager.java b/src/main/java/cn/yescallop/essentialsnk/command/CommandManager.java
index 1025e8f..fca4b39 100644
--- a/src/main/java/cn/yescallop/essentialsnk/command/CommandManager.java
+++ b/src/main/java/cn/yescallop/essentialsnk/command/CommandManager.java
@@ -2,7 +2,6 @@
 
 import cn.nukkit.command.Command;
 import cn.nukkit.command.CommandMap;
-import cn.nukkit.command.SimpleCommandMap;
 import cn.yescallop.essentialsnk.EssentialsAPI;
 import cn.yescallop.essentialsnk.command.defaults.*;
 import cn.yescallop.essentialsnk.command.defaults.teleport.*;