diff --git a/src/types/unitframe.lua b/src/types/unitframe.lua
index 1d4cf6b..eeccab4 100644
--- a/src/types/unitframe.lua
+++ b/src/types/unitframe.lua
@@ -389,10 +389,9 @@ function UnitFrame:Disable()
     if self.hideInRaid then
         UnregisterAttributeDriver(self.secureFrame, "state-visibility")
     elseif self.unit ~= "player" then
-        UnregisterUnitWatch(self.secure_frame, self.condition)
-    else
-        self.secureFrame:Hide()
+        UnregisterUnitWatch(self.secureFrame, false)
     end
+    self.secureFrame:Hide()
 end
 
 -- returns true if this unit is a target unit