diff --git a/VuhDoBarCustomizerHots.lua b/VuhDoBarCustomizerHots.lua
index 65adb0afbbfc6de00b7c25fc488374fd1e0b45b2..3d041d5ca52b1f4ad4aef116fd4ca629b4b49810 100644
--- a/VuhDoBarCustomizerHots.lua
+++ b/VuhDoBarCustomizerHots.lua
@@ -573,7 +573,8 @@ local function VUHDO_updateHots(aUnit, anInfo)
 			end
 
 			if (tExpiry or 0) == 0 then tExpiry = (tNow + 9999); end
-			tHotFromBuff = sBuffs2Hots[tBuffName .. tBuffIcon] or sBuffs2Hots[tSpellId];
+--			tHotFromBuff = sBuffs2Hots[tBuffName .. tBuffIcon] or sBuffs2Hots[tSpellId];
+			tHotFromBuff = sBuffs2Hots[tSpellId];
 
 			if tHotFromBuff == "" or VUHDO_IGNORE_HOT_IDS[tSpellId] then -- non hot buff
 			elseif tHotFromBuff then -- Hot buff cached
@@ -582,7 +583,7 @@ local function VUHDO_updateHots(aUnit, anInfo)
 					VUHDO_snapshotHot(tHotFromBuff, tRest, tStacks, tBuffIcon, tIsCastByPlayer, tDuration, aUnit, tExpiry);
 				end
 			else -- not yet scanned
-				sBuffs2Hots[tBuffName .. tBuffIcon] = "";
+--				sBuffs2Hots[tBuffName .. tBuffIcon] = "";
 				sBuffs2Hots[tSpellId] = "";
 				for tHotCmpName, _ in pairs(VUHDO_ACTIVE_HOTS) do
 					tDiffIcon = VUHDO_CAST_ICON_DIFF[tHotCmpName];
@@ -594,7 +595,7 @@ local function VUHDO_updateHots(aUnit, anInfo)
 						if tRest > 0 then
 							VUHDO_snapshotHot(tHotCmpName, tRest, tStacks, tBuffIcon, tIsCastByPlayer, tDuration, aUnit, tExpiry);
 						end
-						sBuffs2Hots[tBuffName .. tBuffIcon] = tHotCmpName;
+--						sBuffs2Hots[tBuffName .. tBuffIcon] = tHotCmpName;
 						sBuffs2Hots[tSpellId] = tHotCmpName;
 						break;
 					end
diff --git a/changelog.txt b/changelog.txt
index 667da74a7ed3f0a6ff604e35206ec83749d3a7b4..8dc7c996b63715d9ae1c43e90aa5c49635f8633c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,6 +20,7 @@ Bugfixes:
 -- Fixed improper usage of API to check for Druid talent Rampant Growth
 -- Fixed AOE cluster advice for spells which target randomly (thanks BlueRajasmyk)
 -- Fixed interacting with a frame after battle res when using Clique compat mode
+-- Fixed tracking of Shaman tier 18 bonus 'Riptide'
 
 
 Improvements: