diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 13244c5..35e82ab 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -13100,11 +13100,11 @@ void process_parsed_command() {
       #if DISABLED(EMERGENCY_PARSER)
         case 108: gcode_M108(); break;                            // M108: Cancel Waiting
         case 112: gcode_M112(); break;                            // M112: Emergency Stop       
-        case 411: gcode_M411(); break;							  // M411 Emergency parser Skriware 
+        
       #else
         case 108: case 112: break;                      // Silently drop as handled by emergency parser
       #endif
-
+      case 411: gcode_M411(); break;							  // M411 Emergency parser Skriware 
       #if ENABLED(HOST_KEEPALIVE_FEATURE)
         case 113: gcode_M113(); break;                            // M113: Set Host Keepalive Interval
       #endif
diff --git a/Marlin/Version.h b/Marlin/Version.h
index ef4adcc..8f3632c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -36,7 +36,7 @@
    * Marlin release version identifier
    */
 
-  #define SHORT_BUILD_VERSION "1.1.9.7"
+  #define SHORT_BUILD_VERSION "1.1.9.8"
 
   /**
    * Verbose version identifier which should contain a reference to the location
diff --git a/Marlin/emergency_parser.h b/Marlin/emergency_parser.h
index e236564..a80313a 100644
--- a/Marlin/emergency_parser.h
+++ b/Marlin/emergency_parser.h
@@ -136,6 +136,7 @@ class EmergencyParser {
               break;
             case EP_M411:
               clear_gcode_byM411 = true;
+              wait_for_user = wait_for_heatup = false;
               break;
             default:
               break;