diff --git a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/CriticalPathAnalyzerGameState.cs b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/CriticalPathAnalyzerGameState.cs
index a859192..d36e1a8 100644
--- a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/CriticalPathAnalyzerGameState.cs
+++ b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/CriticalPathAnalyzerGameState.cs
@@ -34,7 +34,7 @@ namespace CriticalPathAnalyzer.Client {
 
         public override void OnExit() {
             CriticalPathAnalyzerClient.LoggerInstance.Info("CPA exit");
-            PathHighLighter.RemoveHighLighting();
+            CriticalPathAnalyzerTool.Clear();
         }
     }
 }
\ No newline at end of file
diff --git a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/tool/CriticalPathAnalyzerTool.cs b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/tool/CriticalPathAnalyzerTool.cs
index 8f945d8..9f1de3f 100644
--- a/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/tool/CriticalPathAnalyzerTool.cs
+++ b/CriticalPathAnalyzer/CriticalPathAnalyzer/src/client/tool/CriticalPathAnalyzerTool.cs
@@ -19,6 +19,12 @@ namespace CriticalPathAnalyzer.Client.Tool {
             _logger = logger;
         }
 
+        public static void Clear() {
+            _startPegAddress = null;
+            _endPegAddress = null;
+            PathHighLighter.RemoveHighLighting();
+        }
+
         private static PegAddress? RayCastPeg() {
             // Ray-cast into the world to find what the player is looking at
             HitInfo hitInfo = PlayerCaster.CameraCast(Masks.Environment | Masks.Structure | Masks.Peg | Masks.Wire);