diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
index 38cb132be1..24db80a9ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
@@ -248,12 +248,15 @@ public class XpGlobesOverlay extends Overlay
 		if (mouseOverSkill.getGoalXp() != -1)
 		{
 			int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill());
-			String actionsLeftString = decimalFormat.format(actionsLeft);
-			xpTooltip.getChildren().add(LineComponent.builder()
-				.left("Actions left:")
-				.leftColor(Color.ORANGE)
-				.right(actionsLeftString)
-				.build());
+			if (actionsLeft != Integer.MAX_VALUE)
+			{
+				String actionsLeftString = decimalFormat.format(actionsLeft);
+				xpTooltip.getChildren().add(LineComponent.builder()
+					.left("Actions left:")
+					.leftColor(Color.ORANGE)
+					.right(actionsLeftString)
+					.build());
+			}
 
 			int xpLeft = mouseOverSkill.getGoalXp() - mouseOverSkill.getCurrentXp();
 			String skillXpToLvl = decimalFormat.format(xpLeft);
@@ -264,12 +267,15 @@ public class XpGlobesOverlay extends Overlay
 				.build());
 
 			int xpHr = xpTrackerService.getXpHr(mouseOverSkill.getSkill());
-			String xpHrString = decimalFormat.format(xpHr);
-			xpTooltip.getChildren().add(LineComponent.builder()
-				.left("Xp per hour:")
-				.leftColor(Color.ORANGE)
-				.right(xpHrString)
-				.build());
+			if (xpHr != 0)
+			{
+				String xpHrString = decimalFormat.format(xpHr);
+				xpTooltip.getChildren().add(LineComponent.builder()
+					.left("Xp per hour:")
+					.leftColor(Color.ORANGE)
+					.right(xpHrString)
+					.build());
+			}
 
 			//Create progress bar for skill.
 			ProgressBarComponent progressBar = new ProgressBarComponent();
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 3435d78ad6..93a9e0e718 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
@@ -129,6 +129,7 @@ public class XpTrackerPlugin extends Plugin
 	@Override
 	protected void shutDown() throws Exception
 	{
+		xpState.reset();
 		pluginToolbar.removeNavigation(navButton);
 	}