diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
index a488b52e9071..e613b013b38f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/LastServersConfig.java
@@ -9,7 +9,7 @@
 public class LastServersConfig {
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Receive notifications when you rejoin a server you have previously joined.")
+    @ConfigOption(name = "Enabled", desc = "Receive notifications when you rejoin a server you were in previously.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean enabled = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
index 8bc2d96e45f8..7a59ef4f6520 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LastServers.kt
@@ -26,14 +26,18 @@ object LastServers {
         // Update the time of the current server if the player is still on the same server.
         // This is necessary because the player can be on the same server for a long time.
         // And if the player leaves the server and joins it again, it still warns the player.
-        lastServers[id] = SimpleTimeMark.now()
+        if (lastServerId == id) {
+            lastServers[id] = SimpleTimeMark.now()
+            return
+        }
 
         lastServers.entries.removeIf { it.value.passedSince() > config.warnTime.seconds }
         lastServers[id]?.passedSince()?.let {
-            ChatUtils.chat("§7You already joined this server §b${it.format()}§7 ago.")
+            ChatUtils.chat("§7You were already on this server §b${it.format()}§7 ago.")
         }
         ChatUtils.debug("Adding $id to last servers.")
         lastServerId = id
+        lastServers[id] = SimpleTimeMark.now()
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled