diff --git a/.luacheckrc b/.luacheckrc
index 466b30f09a..ca414fa0a8 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -50,6 +50,7 @@ files["**/Plugins/Bars.lua"].ignore = {
 files["**/Plugins/BossBlock.lua"].ignore = {
 	"113/AlertFrame",
 	"112/BigWigs",
+	"113/C_ContentTracking",
 	"113/C_CVar",
 	"113/C_TalkingHead",
 	"113/TooltipDataProcessor",
@@ -191,7 +192,6 @@ globals = {
 	"GetSpellTexture",
 	"GetSubZoneText",
 	"GetTime",
-	"GetTrackedAchievements",
 	"InCombatLockdown",
 	"IsAddOnLoaded",
 	"IsAddOnLoadOnDemand",
diff --git a/Plugins/BossBlock.lua b/Plugins/BossBlock.lua
index ade6c65310..64f3ce70e8 100644
--- a/Plugins/BossBlock.lua
+++ b/Plugins/BossBlock.lua
@@ -391,7 +391,8 @@ do
 		CheckElv(self)
 		-- Never hide when tracking achievements or in Mythic+
 		local _, _, diff = GetInstanceInfo()
-		if not restoreObjectiveTracker and self.db.profile.blockObjectiveTracker and not GetTrackedAchievements() and diff ~= 8 and not trackerHider.IsProtected(ObjectiveTrackerFrame) then
+		local trackedAchievements = C_ContentTracking.GetTrackedIDs(2) -- Enum.ContentTrackingType.Achievement = 2
+		if not restoreObjectiveTracker and self.db.profile.blockObjectiveTracker and not next(trackedAchievements) and diff ~= 8 and not trackerHider.IsProtected(ObjectiveTrackerFrame) then
 			restoreObjectiveTracker = trackerHider.GetParent(ObjectiveTrackerFrame)
 			if restoreObjectiveTracker then
 				trackerHider.SetFixedFrameStrata(ObjectiveTrackerFrame, true) -- Changing parent would change the strata & level, lock it first