diff --git a/afk.js b/afk.js
index 061d5f2..97d8dc4 100644
--- a/afk.js
+++ b/afk.js
@@ -127,12 +127,17 @@ const bot = mineflayer.createBot({
 // Event handlers
 bot.on("login", () => {
   log("Bot logged in");
+  hasDetectedTeleport = false;
+  clearAfkRetryTimer();
   bot.setControlState("forward", false);
 });
 
 bot.on("spawn", () => {
   log("Bot spawned");
-  hasDetectedTeleport = false;
+  if (hasDetectedTeleport) {
+    log("Teleport already confirmed before spawn; skipping AFK retry schedule");
+    return;
+  }
   scheduleAfkRetryCheck();
 });