diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
index bf6ebe8ac6..6dec6f727e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -71,10 +71,12 @@ public class XpTrackerPlugin extends Plugin
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged event)
 	{
-		//reset upon login
-		if (event.getGameState() == GameState.LOGGED_IN)
+		// reset on world hop or logging in
+		switch (event.getGameState())
 		{
-			xpPanel.resetAllSkillXpHr();
+			case HOPPING:
+			case LOGGING_IN:
+				xpPanel.resetAllSkillXpHr();
 		}
 	}