diff --git a/Modules/Options/AdvancedTab/QuestieOptionsAdvanced.lua b/Modules/Options/AdvancedTab/QuestieOptionsAdvanced.lua
index c655f50..8fa4b66 100644
--- a/Modules/Options/AdvancedTab/QuestieOptionsAdvanced.lua
+++ b/Modules/Options/AdvancedTab/QuestieOptionsAdvanced.lua
@@ -73,6 +73,10 @@ local function ApplyLearnerPerformancePreset(mode)
         settings.learnerCommsIntensity = "normal"
         settings.minConfidencePins = 1
     end
+
+    if mode == "realtime" or mode == "balanced" or mode == "low" then
+        Questie.db.profile.learnerBroadcast = true
+    end
 end
 
 function QuestieOptions.tabs.advanced:Initialize()
diff --git a/Modules/QuestieLearner.lua b/Modules/QuestieLearner.lua
index 21beb77..54c6b9e 100644
--- a/Modules/QuestieLearner.lua
+++ b/Modules/QuestieLearner.lua
@@ -471,6 +471,10 @@ local function _FlushActiveQuestPins()
     _pendingQuestPinRefreshTimer = nil
 
     if not next(questIdSet) then return end
+    if GetLearnerSetting("pinRefreshMode", "batched") == "manual" then
+        _pendingQuestFrameUnloads = {}
+        return
+    end
     if not QuestieQuest or not QuestieQuest.UpdateQuest then return end
     if not QuestiePlayer or not QuestiePlayer.currentQuestlog then return end