diff --git a/CHANGELOG.md b/CHANGELOG.md
index e031d541..73833e69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## v11.0.5
-* Most cooldown icons with Range Check enabled now utilize more performant event-driven updates in WoW 11.0.
+* Spell Cooldown and Reactive Ability icons are vastly more efficient if the tracked ability is on your action bars (macros excluded).
+  * This is done by utilizing new WoW 11.0 APIs that are specific to abilities present on action bars.
 
 ## v11.0.4
 * Fix: #2186 Activation overlays in Retail
diff --git a/Components/Core/Common/Actions.lua b/Components/Core/Common/Actions.lua
index 3bbfee09..1aab021e 100644
--- a/Components/Core/Common/Actions.lua
+++ b/Components/Core/Common/Actions.lua
@@ -61,7 +61,9 @@ local function UpdateActionSlots()
             -- but I can just imagine people with weird @focus macros
             -- wondering why their icon doesn't update sometimes.
 
-            local baseId = FindBaseSpellByID(id);
+            -- https://github.com/ascott18/TellMeWhen/issues/2198 
+            -- Sometimes, FindBaseSpellByID can return `nil`. Fall back to `id` if it does.
+            local baseId = FindBaseSpellByID(id) or id;
 
             local normalName = strlowerCache[(GetSpellName(id))]
             local baseName = strlowerCache[(GetSpellName(baseId))]
diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
index 116a4472..43b5f43c 100644
--- a/Options/CHANGELOG.lua
+++ b/Options/CHANGELOG.lua
@@ -4,7 +4,8 @@ TMW.CHANGELOG_LASTVER="10.0.0"
 
 TMW.CHANGELOG = [==[
 ## v11.0.5
-* Most cooldown icons with Range Check enabled now utilize more performant event-driven updates in WoW 11.0.
+* Spell Cooldown and Reactive Ability icons are vastly more efficient if the tracked ability is on your action bars (macros excluded).
+  * This is done by utilizing new WoW 11.0 APIs that are specific to abilities present on action bars.
 
 ## v11.0.4
 * Fix: #2186 Activation overlays in Retail