diff --git a/PetButton.lua b/PetButton.lua
index 5211482..be84579 100644
--- a/PetButton.lua
+++ b/PetButton.lua
@@ -15,7 +15,9 @@ local _G = _G
 local format = string.format
 
 local function onEnter(self, ...)
-	self:OnEnter(...)
+	if not (Bartender4.db.profile.tooltip == "nocombat" and InCombatLockdown()) and Bartender4.db.profile.tooltip ~= "disabled" then
+		self:OnEnter(...)
+	end
 	KeyBound:Set(self)
 end
 
diff --git a/StanceBar.lua b/StanceBar.lua
index 8a7be37..c7756e6 100644
--- a/StanceBar.lua
+++ b/StanceBar.lua
@@ -154,7 +154,9 @@ function StanceButtonPrototype:ClearSetPoint(...)
 end
 
 local function onEnter(self, ...)
-	self:OnEnter(...)
+	if not (Bartender4.db.profile.tooltip == "nocombat" and InCombatLockdown()) and Bartender4.db.profile.tooltip ~= "disabled" then
+		self:OnEnter(...)
+	end
 	KeyBound:Set(self)
 end