diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index 0858d7e9..124c0a34 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -787,6 +787,20 @@ pfUI:RegisterModule("nameplates", "vanilla:tbc", function ()
       nameplate.eventcache = nil
     end
 
+    -- reset strata cache on target change
+    if nameplate.istarget ~= target then
+      nameplate.target_strata = nil
+    end
+
+    -- keep target nameplate above others
+    if target and nameplate.target_strata ~= 1 then
+      nameplate:SetFrameStrata("LOW")
+      nameplate.target_strata = 1
+    elseif not target and nameplate.target_strata ~= 0 then
+      nameplate:SetFrameStrata("BACKGROUND")
+      nameplate.target_strata = 0
+    end
+
     -- cache target value
     nameplate.istarget = target