diff --git a/src/bungee.yml b/src/bungee.yml
index 13cc880..975ba27 100644
--- a/src/bungee.yml
+++ b/src/bungee.yml
@@ -1,4 +1,4 @@
 name: VentureChat
 main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
-version: 2.22.1
+version: 2.22.2
 author: Aust1n46
\ No newline at end of file
diff --git a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
index 916cfbe..d54c962 100644
--- a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java
@@ -11,7 +11,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import mineverse.Aust1n46.chat.MineverseChat;
@@ -28,17 +27,6 @@ public class LoginListener implements Listener {
 	private MineverseChat plugin = MineverseChat.getInstance();
 	private boolean firstPlayerHasJoined = false;
 
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerKick(PlayerKickEvent plog) {
-		if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
-			plog.setLeaveMessage(Format.FormatStringAll(plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").replace("{player}", plog.getPlayer().getName())));
-		}
-		if(!plugin.getConfig().getConfigurationSection("logout").getBoolean("enabled", true)) {
-			plog.setLeaveMessage("");
-		}
-		playerLeaving(plog.getPlayer());
-	}
-
 	@EventHandler(priority = EventPriority.LOW)
 	public void onPlayerQuit(PlayerQuitEvent plog) {
 		if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
@@ -49,6 +37,14 @@ public class LoginListener implements Listener {
 		}
 		playerLeaving(plog.getPlayer());
 	}
+	
+	private void playerLeaving(Player player) {
+		MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
+		PlayerData.savePlayerData(mcp);
+		mcp.clearMessages();
+		mcp.setOnline(false);
+		MineverseChatAPI.removeMineverseChatOnlinePlayerToMap(mcp);
+	}
 
 	@EventHandler(priority = EventPriority.LOW)
 	public void onPlayerJoin(PlayerJoinEvent event) throws Exception {
@@ -121,12 +117,4 @@ public class LoginListener implements Listener {
 			event.setJoinMessage("");
 		}
 	}
-
-	private void playerLeaving(Player player) {
-		MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
-		PlayerData.savePlayerData(mcp);
-		mcp.clearMessages();
-		mcp.setOnline(false);
-		MineverseChatAPI.removeMineverseChatOnlinePlayerToMap(mcp);
-	}
-}
\ No newline at end of file
+}
diff --git a/src/plugin.yml b/src/plugin.yml
index 4388ed0..3e4c557 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,5 +1,5 @@
 name: VentureChat
-version: 2.22.1
+version: 2.22.2
 api-version: 1.13
 main: mineverse.Aust1n46.chat.MineverseChat
 depend: [Vault, ProtocolLib, PlaceholderAPI]