diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index fdcfb8aa..dd18faa1 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -463,7 +463,7 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
 
   nameplates.OnEvent = function(frame)
     local frame = frame or this
-    nameplates:OnDataChanged(frame)
+    frame.eventcache = true
   end
 
   nameplates.OnDataChanged = function(self, plate)
@@ -666,6 +666,12 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
     local target = UnitExists("target") and frame:GetAlpha() == 1 or nil
     local mouseover = UnitExists("mouseover") and original.glow:IsShown() or nil
 
+    -- trigger queued event update
+    if nameplate.eventcache then
+      nameplates:OnDataChanged(nameplate)
+      nameplate.eventcache = nil
+    end
+
     -- cache target value
     nameplate.istarget = target