diff --git a/modules/chat.lua b/modules/chat.lua
index a26e2491..ad09a24d 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -368,10 +368,6 @@ pfUI:RegisterModule("chat", "vanilla:tbc", function ()
         frame:SetPoint("TOPLEFT", pfUI.chat.right ,"TOPLEFT", default_border, -panelheight)
         frame:SetPoint("BOTTOMRIGHT", pfUI.chat.right ,"BOTTOMRIGHT", -default_border, bottompadding)
         frame:Show()
-      elseif i == 2 and C.chat.global.combathide == "1" then
-        -- Combat Log
-        FCF_UnDockFrame(frame)
-        FCF_Close(frame)
       elseif frame.isDocked then
         -- Left Chat
         local bottompadding = pfUI.panel and pfUI.panel.left:IsShown() and not pfUI_config.position["pfPanelLeft"] and panelheight or default_border
@@ -391,6 +387,12 @@ pfUI:RegisterModule("chat", "vanilla:tbc", function ()
         tab:SetParent(UIParent)
       end
 
+      -- Combat Log
+      if C.chat.global.combathide == "1" and frame.pfCombatLog then
+        FCF_UnDockFrame(frame)
+        FCF_Close(frame)
+      end
+
       -- hide textures
       for j,v in ipairs({tab:GetRegions()}) do
         if j==5 then v:SetTexture(0,0,0,0) end