diff --git a/ui/game/enemy_location.lua b/ui/game/enemy_location.lua
index 12e37583..32731576 100644
--- a/ui/game/enemy_location.lua
+++ b/ui/game/enemy_location.lua
@@ -241,6 +241,7 @@ end
 
 G.FUNCS.mp_setup_hover_enemy_location_display = function(e)
 	e.config.func = nil
+	if MP.LOBBY.config.enemy_location_disabled then return end
 	e.states.collide.can = true
 	e.states.hover.can = true
 
diff --git a/ui/game/timer.lua b/ui/game/timer.lua
index 37f5402d..dcc44dfe 100644
--- a/ui/game/timer.lua
+++ b/ui/game/timer.lua
@@ -551,7 +551,7 @@ function MP.UI.update_matching_skip_timer(from_nemesis)
         return
     end
 
-    local new_diff = math.abs((MP.GAME.skips_before_pvp or 0) - (MP.GAME.enemy.skips_before_pvp or 0))
+    local new_diff = math.max((MP.GAME.skips_before_pvp or 0) - (MP.GAME.enemy.skips_before_pvp or 0), 0)
     local skips_dx = new_diff - (MP.GAME.skips_difference or 0)
     MP.GAME.skips_difference = new_diff