diff --git a/Diminish/Diminish.lua b/Diminish/Diminish.lua
index eb5a47c..bd3f56b 100644
--- a/Diminish/Diminish.lua
+++ b/Diminish/Diminish.lua
@@ -252,7 +252,7 @@ function Diminish:PLAYER_LOGIN()
 
     local Masque = LibStub and LibStub("Masque", true)
     NS.MasqueGroup = Masque and Masque:Group("Diminish")
-    if EditModeManagerFrame then
+    if EditModeManagerFrame and EditModeManagerFrame.UseRaidStylePartyFrames then
         NS.useCompactPartyFrames = EditModeManagerFrame:UseRaidStylePartyFrames()
     else
         NS.useCompactPartyFrames = GetCVarBool("useCompactPartyFrames")
diff --git a/Diminish_Options/testmode.lua b/Diminish_Options/testmode.lua
index 4f58a1e..49cc014 100644
--- a/Diminish_Options/testmode.lua
+++ b/Diminish_Options/testmode.lua
@@ -156,7 +156,7 @@ function TestMode:ToggleArenaAndPartyFrames(state, forceHide)
     end
 
     local useCompact = GetCVarBool("useCompactPartyFrames")
-    if EditModeManagerFrame then
+    if EditModeManagerFrame and EditModeManagerFrame.UseRaidStylePartyFrames then
         useCompact = EditModeManagerFrame:UseRaidStylePartyFrames()
     end
     if useCompact and settings.party.enabled and showFlag then