diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 4828382d2..881d5a636 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -107,7 +107,8 @@ public class EssentialsPlayerListener extends PlayerListener
 			return;
 		}
 
-		if (user.getAfkPosition().distanceSquared(user.getLocation()) > 9) {
+		Location afk = user.getAfkPosition();
+		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9) {
 			user.updateActivity(true);
 		}