diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
index 7e7e5bb..0774c5d 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
@@ -36,10 +36,10 @@ public class VanishCommand extends SimpleCommand {
         if (player.isOp()) {
             for (Player online : Bukkit.getOnlinePlayers()) {
                 if (vanishedPlayers.getOrDefault(player.getUniqueId(), false)) {
-                    player.showPlayer(BlazeSMP.getInstance(), online);
+                    online.showPlayer(BlazeSMP.getInstance(), player);
                     online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.join")).append(player.playerListName()));
                 } else {
-                    player.hidePlayer(BlazeSMP.getInstance(), online);
+                    online.hidePlayer(BlazeSMP.getInstance(), player);
                     online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.left")).append(player.playerListName()));
                 }
             }
diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerQuitListener.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerQuitListener.java
new file mode 100644
index 0000000..76c7fdb
--- /dev/null
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerQuitListener.java
@@ -0,0 +1,28 @@
+package me.freezy.plugins.papermc.blazesmp.listener;
+
+import me.freezy.plugins.papermc.blazesmp.manager.PlayerManager;
+import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scoreboard.Team;
+
+
+import java.util.UUID;
+
+public class PlayerQuitListener implements Listener {
+
+    @EventHandler
+    public void onQuit(PlayerQuitEvent event) {
+        UUID playerUUID = event.getPlayer().getUniqueId();
+        Player player = event.getPlayer();
+        new PlayerManager().setPlayerTeam(player);
+        Team team = player.getScoreboard().getEntryTeam(player.getName());
+
+        assert team != null;
+        event.quitMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.left"))
+                .append(player.playerListName()));
+    }
+}