diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
index 4ef46fc8..80ba74c3 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
@@ -274,7 +274,9 @@ public class AsynchronousLogin implements AsynchronousProcess {
             auth.setRealName(player.getName());
             auth.setLastLogin(System.currentTimeMillis());
             auth.setLastIp(ip);
-            auth.setQuitLocation(player.getLocation());
+            if (isFirstLogin) {
+                auth.setQuitLocation(player.getLocation());
+            }
             dataSource.updateSession(auth);
 
             // TODO: send an update when a messaging service will be implemented (SESSION)