diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index f27c7851..5310e6c7 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -572,8 +572,10 @@ pfUI:RegisterModule("nameplates", function ()
   pfUI.nameplates.combat:SetScript("OnEvent", function()
     if event == "PLAYER_ENTER_COMBAT" then
       this.inCombat = 1
+      if PlayerFrame then PlayerFrame.inCombat = 1 end
     elseif event == "PLAYER_LEAVE_COMBAT" then
       this.inCombat = nil
+      if PlayerFrame then PlayerFrame.inCombat = nil end
     end
   end)