diff --git a/ShestakUI/Modules/Blizzard/PetBattle.lua b/ShestakUI/Modules/Blizzard/PetBattle.lua
index bd94bd3e24..ea2b817138 100644
--- a/ShestakUI/Modules/Blizzard/PetBattle.lua
+++ b/ShestakUI/Modules/Blizzard/PetBattle.lua
@@ -242,15 +242,23 @@ bar:SetScript("OnEvent", function(self, event)
 	if event == "PET_BATTLE_OPENING_START" then
 		if C.unitframe.enable == true then
 			oUF_Player:SetAlpha(0)
-			oUF_Pet:SetAlpha(0)
-			oUF_Focus:SetAlpha(0)
+			if C.unitframe.show_pet == true then
+				oUF_Pet:SetAlpha(0)
+			end
+			if C.unitframe.show_focus == true then
+				oUF_Focus:SetAlpha(0)
+			end
 		end
 		self:Show()
 	else
 		if C.unitframe.enable == true then
 			oUF_Player:SetAlpha(1)
-			oUF_Pet:SetAlpha(1)
-			oUF_Focus:SetAlpha(1)
+			if C.unitframe.show_pet == true then
+				oUF_Pet:SetAlpha(1)
+			end
+			if C.unitframe.show_focus == true then
+				oUF_Focus:SetAlpha(1)
+			end
 		end
 		self:Hide()
 	end