diff --git a/Omen.lua b/Omen.lua
index 237e924..071fccd 100644
--- a/Omen.lua
+++ b/Omen.lua
@@ -1561,9 +1561,12 @@ function Omen:UpdateBars()
 		tinsert(threatStore, threatTable)
 		tinsert(threatStoreTime, GetTime())
 		-- Store last scanned mob GUID
-		lastWarn.mobGUID = mobGUID
-		lastWarn.tankGUID = tankGUID or mobTargetGUID or sortTable[1]
-		lastWarn.threatpercent = myThreatPercent
+		local u = tankGUID or mobTargetGUID or (dbBar.ShowAggroBar and sortTable[2] or sortTable[1])
+		if u ~= "AGGRO" then
+			lastWarn.mobGUID = mobGUID
+			lastWarn.tankGUID = u
+			lastWarn.threatpercent = myThreatPercent
+		end
 		threatTable = nil
 	end
 end