diff --git a/build-number.txt b/build-number.txt
index 222272ad..74eeb814 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1488
\ No newline at end of file
+1489
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
index d9edcbf5..6b9ea3c7 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
@@ -12,6 +12,7 @@ import org.geysermc.mcprotocollib.network.packet.Packet;
 import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntry;
 import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntryAction;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandSuggestionsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerInfoRemovePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerInfoUpdatePacket;
 
@@ -167,9 +168,15 @@ public class PlayersPlugin extends Bot.Listener {
     }
 
     private void onTabCompleteTick () {
-        if (tabCompleteQueue.isEmpty()) return;
+        if (!bot.loggedIn || tabCompleteQueue.isEmpty()) return;
 
-        bot.tabComplete.tabComplete("/minecraft:scoreboard players add ").thenApplyAsync(packet -> {
+        final CompletableFuture<ClientboundCommandSuggestionsPacket> future = bot.tabComplete.tabComplete(
+                "/minecraft:scoreboard players add "
+        );
+
+        if (future == null) return;
+
+        future.thenApplyAsync(packet -> {
             final String[] matches = packet.getMatches();
             final Component[] tooltips = packet.getTooltips();
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java
index 01d4144e..b676886f 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java
@@ -21,6 +21,8 @@ public class TabCompletePlugin extends Bot.Listener {
     }
 
     public CompletableFuture<ClientboundCommandSuggestionsPacket> tabComplete (String command) {
+        if (!bot.loggedIn) return null;
+
         final int transactionId = nextTransactionId++;
 
         bot.session.send(new ServerboundCommandSuggestionPacket(transactionId, command));