diff --git a/changelog.md b/changelog.md
index 551cf89..9770923 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@ v1.14.21:
 
 - Increased maximum scale/zoom to 400%, by request.
 - Fixed TargetCC/FocusCC modules on Wrath Classic.
+- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
 
 v1.14.20:
 
diff --git a/modules/CustomBar.lua b/modules/CustomBar.lua
index a3203db..fb79bc9 100644
--- a/modules/CustomBar.lua
+++ b/modules/CustomBar.lua
@@ -883,9 +883,14 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
 	end
 
 	if self.moduleSettings.displayMode == displayModes.MISSING then
-		IceCustomBar.super.prototype.Show(self, not bShouldShow)
+		local show = not bShouldShow
+		if show and not self:IsEnabled() then
+			show = false
+		end
+
+		IceCustomBar.super.prototype.Show(self, show)
 	elseif self.moduleSettings.displayMode == displayModes.WHEN_TARGETING and self.target then
-		IceCustomBar.super.prototype.Show(self, true)
+		IceCustomBar.super.prototype.Show(self, self:IsEnabled())
 	elseif self.moduleSettings.displayMode == displayModes.ALWAYS then
 		if not self.bIsVisible then
 			IceCustomBar.super.prototype.Show(self, true)
diff --git a/this_version.md b/this_version.md
index ea6a5a8..900d68a 100644
--- a/this_version.md
+++ b/this_version.md
@@ -4,6 +4,7 @@ v1.14.21:
 
 - Increased maximum scale/zoom to 400%, by request.
 - Fixed TargetCC/FocusCC modules on Wrath Classic.
+- Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
 
 v1.14.20: