diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index c2203cdf90..2cab0aa2be 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -493,9 +493,10 @@ bool MMU2::unload() {
         return false;
     }
 
+    WaitForHotendTargetTempBeep();
+
     {
         ReportingRAII rep(CommandInProgress::UnloadFilament);
-        WaitForHotendTargetTempBeep();
         UnloadInner();
     }
 
@@ -573,14 +574,14 @@ bool MMU2::load_filament_to_nozzle(uint8_t slot) {
         return false;
     }
 
+    WaitForHotendTargetTempBeep();
+
     FullScreenMsgLoad(slot);
     {
         // used for MMU-menu operation "Load to Nozzle"
         ReportingRAII rep(CommandInProgress::ToolChange);
         FSensorBlockRunout blockRunout;
 
-        WaitForHotendTargetTempBeep();
-
         if (extruder != MMU2_NO_TOOL) { // we already have some filament loaded - free it + shape its tip properly
             filament_ramming();
         }