diff --git a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyPlugin.kt b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyPlugin.kt
index eea59fc..8b5c706 100644
--- a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyPlugin.kt
+++ b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyPlugin.kt
@@ -42,8 +42,6 @@ class ChattyPlugin : JavaPlugin() {
             autoscan(classLoader, "com.mineinabyss.chatty") {
                 all()
             }
-            ChattyCommands()
-            listeners(ChatListener(), PlayerListener())
         }
     }
 
diff --git a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/ChatListener.kt b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/ChatListener.kt
index a7e4ee7..0c43033 100644
--- a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/ChatListener.kt
+++ b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/ChatListener.kt
@@ -30,7 +30,7 @@ class ChatListener : Listener {
 
     @EventHandler
     fun PlayerCommandPreprocessEvent.onPlayerCommand() {
-        Bukkit.getOnlinePlayers().filter { it != player && it.toGeary().has<CommandSpy>() }.forEach { p ->
+        Bukkit.getOnlinePlayers().filter { it.uniqueId != player.uniqueId && it.toGeary().has<CommandSpy>() }.forEach { p ->
             p.sendFormattedMessage(chatty.config.chat.commandSpyFormat, message, optionalPlayer = player)
         }
     }