diff --git a/core/parser.lua b/core/parser.lua
index ffe38597a..f5a9e3f09 100755
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -6009,7 +6009,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 		local completionInfo = C_ChallengeMode.GetChallengeCompletionInfo()
 
 		local primaryAffix = 0
-		local mapID = Details.challengeModeMapId or C_ChallengeMode.GetActiveChallengeMapID()
+		local mapID = completionInfo.mapChallengeModeID or Details.challengeModeMapId or C_ChallengeMode.GetActiveChallengeMapID()
 		local upgradeMembers = completionInfo.members
 		local level = completionInfo.level
 		local time = completionInfo.time
diff --git a/functions/storage.lua b/functions/storage.lua
index ab5a90358..c8a1d2e05 100644
--- a/functions/storage.lua
+++ b/functions/storage.lua
@@ -1029,8 +1029,9 @@ function Details.Database.StoreEncounter(combat)
 	end
 
 	if (diffName == "mythicdungeon") then
-		local mythicLevel = C_ChallengeMode.GetActiveKeystoneInfo()
-		local mapChallengeModeID = C_ChallengeMode.GetActiveChallengeMapID()
+		local completionInfo = C_ChallengeMode.GetChallengeCompletionInfo()
+		local mapChallengeModeID = completionInfo.mapChallengeModeID
+		local mythicLevel = completionInfo.level
 
 		if (not mythicLevel and not mapChallengeModeID) then
 			return
diff --git a/startup.lua b/startup.lua
index fc61bc0c5..593e2a64a 100644
--- a/startup.lua
+++ b/startup.lua
@@ -28,7 +28,7 @@ function Details222.StartUp.StartMeUp()
 		Details:FillUserCustomSpells()
 	end)
 
-	Details.challengeModeMapId = C_ChallengeMode.GetActiveChallengeMapID()
+	Details.challengeModeMapId = C_ChallengeMode and C_ChallengeMode.GetActiveChallengeMapID()
 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --row single click, this determines what happen when the user click on a bar