diff --git a/build-number.txt b/build-number.txt
index a268f484..485e1224 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-3065
\ No newline at end of file
+3066
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java
index 3352fb0d..b9b0ffd5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Bot.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java
@@ -146,6 +146,7 @@ public class Bot extends SessionAdapter {
         this.world = new WorldPlugin(this);
         this.core = new CorePlugin(this);
         this.team = new TeamPlugin(this);
+        this.playersDatabase = new PlayersDatabasePlugin(this);
         this.players = new PlayersPlugin(this);
         this.tabComplete = new TabCompletePlugin(this);
         this.commandHandler = new CommandHandlerPlugin(this);
@@ -170,7 +171,6 @@ public class Bot extends SessionAdapter {
         // this.screenshare = new ScreensharePlugin(this);
         this.clearChatNameAnnouncer = new ClearChatNameAnnouncerPlugin(this);
         this.whitelist = new WhitelistPlugin(this);
-        this.playersDatabase = new PlayersDatabasePlugin(this);
         this.ipFilter = new IPFilterPlugin(this);
         this.rainbowArmor = new RainbowArmorPlugin(this);
     }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
index 7bcfc92e..2b1d69a7 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
@@ -10,6 +10,7 @@ import me.chayapak1.chomens_bot.Main;
 import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -182,27 +183,40 @@ public class PlayersDatabasePlugin implements Listener {
     }
 
     @Override
-    public void onPlayerLeft (final PlayerEntry target) {
+    public void disconnected (final DisconnectedEvent event) {
         DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
-            try {
-                final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER);
-
-                updatePlayerStatement.setString(1, "$.lastSeen");
-                updatePlayerStatement.setString(2, "$.lastSeen");
-
-                final ObjectNode lastSeenObject = getLastSeenObject();
-
-                updatePlayerStatement.setString(3, objectMapper.writeValueAsString(lastSeenObject));
-
-                updatePlayerStatement.setString(4, target.profile.getName());
-
-                updatePlayerStatement.executeUpdate();
-            } catch (final SQLException | JsonProcessingException e) {
-                bot.logger.error(e);
+            synchronized (bot.players.list) {
+                for (final PlayerEntry target : bot.players.list) {
+                    updateLastSeenEntry(target);
+                }
             }
         });
     }
 
+    @Override
+    public void onPlayerLeft (final PlayerEntry target) {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> updateLastSeenEntry(target));
+    }
+
+    private void updateLastSeenEntry (final PlayerEntry target) {
+        try {
+            final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER);
+
+            updatePlayerStatement.setString(1, "$.lastSeen");
+            updatePlayerStatement.setString(2, "$.lastSeen");
+
+            final ObjectNode lastSeenObject = getLastSeenObject();
+
+            updatePlayerStatement.setString(3, objectMapper.writeValueAsString(lastSeenObject));
+
+            updatePlayerStatement.setString(4, target.profile.getName());
+
+            updatePlayerStatement.executeUpdate();
+        } catch (final SQLException | JsonProcessingException e) {
+            bot.logger.error(e);
+        }
+    }
+
     private ObjectNode getLastSeenObject () {
         final ObjectNode object = JsonNodeFactory.instance.objectNode();