diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 31424d9e2..413dec652 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3121,16 +3121,18 @@ void gcode_M600(bool automatic, float x_position, float y_position, float z_shif
 
 		if (mmu_enabled)
 		{
-			if (saved_printing) mmu_eject_filament(mmu_extruder, false); //if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it
-			if (!automatic) mmu_M600_wait_and_beep();
-			if (saved_printing) {
+			if (!automatic) {
+				if (saved_printing) mmu_eject_filament(mmu_extruder, false); //if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it
+				mmu_M600_wait_and_beep();
+				if (saved_printing) {
 
-				lcd_clear();
-				lcd_set_cursor(0, 2);
-				lcd_puts_P(_T(MSG_PLEASE_WAIT));
+					lcd_clear();
+					lcd_set_cursor(0, 2);
+					lcd_puts_P(_T(MSG_PLEASE_WAIT));
 
-				mmu_command(MMU_CMD_R0);
-				manage_response(false, false);
+					mmu_command(MMU_CMD_R0);
+					manage_response(false, false);
+				}
 			}
 			mmu_M600_load_filament(automatic);
 		}