diff --git a/IceBarElement.lua b/IceBarElement.lua
index 7838979..85592a5 100644
--- a/IceBarElement.lua
+++ b/IceBarElement.lua
@@ -1207,7 +1207,9 @@ function IceBarElement.prototype:SetScale(inScale, force)
 		self:ConditionalSetupUpdate()
 	else
 		if self.CurrScale == self.DesiredScale then
-			IceHUD.IceCore:RequestUpdates(self, nil)
+			-- Parnic: this optimization may be reaching a bit too far and causing things to get stuck
+			--         without this, several modules continues to update that don't need to but the stuck issues seem to be decreased
+			--IceHUD.IceCore:RequestUpdates(self, nil)
 		end
 	end
 end
diff --git a/modules/CastBar.lua b/modules/CastBar.lua
index d312214..93684b3 100644
--- a/modules/CastBar.lua
+++ b/modules/CastBar.lua
@@ -303,6 +303,10 @@ function CastBar.prototype:Enable(core)
 	if self.moduleSettings.enabled and not self.moduleSettings.showBlizzCast then
 		self:ToggleBlizzCast(false)
 	end
+
+	if self.moduleSettings.shouldAnimate then
+		self.moduleSettings.shouldAnimate = false
+	end
 end