diff --git a/src/modlunky2/ui/trackers/gem.py b/src/modlunky2/ui/trackers/gem.py
index 5ae15c9f1..f640d9e87 100644
--- a/src/modlunky2/ui/trackers/gem.py
+++ b/src/modlunky2/ui/trackers/gem.py
@@ -210,6 +210,7 @@ def poll(self, proc: Spel2Process, config: GemTrackerConfig) -> WindowData:
             return None
 
         level_has_ghost = game_state.theme not in [
+            Theme.BASE_CAMP,
             Theme.OLMEC,
             Theme.ABZU,
             Theme.DUAT,
@@ -223,7 +224,9 @@ def poll(self, proc: Spel2Process, config: GemTrackerConfig) -> WindowData:
         level = game_state.level
 
         # On level change
-        if world != self.world or level != self.level:
+        if (
+            world != self.world or level != self.level
+        ) and game_state.theme != Theme.BASE_CAMP:
             # Update world and level
             self.world = world
             self.level = level
diff --git a/src/modlunky2/ui/trackers/pacino_golf_tracker.py b/src/modlunky2/ui/trackers/pacino_golf_tracker.py
index 531e34765..777ac7b5d 100644
--- a/src/modlunky2/ui/trackers/pacino_golf_tracker.py
+++ b/src/modlunky2/ui/trackers/pacino_golf_tracker.py
@@ -248,7 +248,9 @@ def poll(self, proc: Spel2Process, config: PacinoGolfTrackerConfig) -> WindowDat
         level = game_state.level
 
         # Save treasure strokes on level change
-        if world != self.world or level != self.level:
+        if (
+            world != self.world or level != self.level
+        ) and game_state.theme != Theme.BASE_CAMP:
             self.world = world
             self.level = level
             self.treasure_strokes += self.treasure_strokes_level