diff --git a/api/unitframes.lua b/api/unitframes.lua
index 0e588f5a..3d629f83 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -1182,15 +1182,9 @@ end
 function pfUI.uf.OnEnter()
   if not this.label then return end
 
-  -- Nampower: Set native mouseover unit for macro/addon compatibility
-  if SetMouseoverUnit then
-    local unitstr = this.label .. this.id
-    -- For GUID-based frames (focus), use the GUID directly
-    if this.label and string.find(this.label, "^0x") then
-      SetMouseoverUnit(this.label)
-    elseif UnitExists(unitstr) then
-      SetMouseoverUnit(unitstr)
-    end
+  local unitstr = this.label .. this.id
+  if UnitExists(unitstr) then
+    SetMouseoverUnit(unitstr)
   end
 
   if this.config.showtooltip == "0" then return end
@@ -1200,10 +1194,7 @@ function pfUI.uf.OnEnter()
 end
 
 function pfUI.uf.OnLeave()
-  -- Nampower: Clear native mouseover unit
-  if SetMouseoverUnit then
-    SetMouseoverUnit()
-  end
+  SetMouseoverUnit("")
 
   GameTooltip:FadeOut()
 end