diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 3bde72397..6f43c7f87 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -6734,6 +6734,10 @@ Sigma_Exit:
 	}
 	break;
 
+  case 603: { //! M603 - Stop print
+		lcd_print_stop();
+	}
+
 #ifdef PINDA_THERMISTOR
 	case 860: // M860 - Wait for PINDA thermistor to reach target temperature.
 	{
@@ -9501,7 +9505,6 @@ void restore_print_from_ram_and_continue(float e_move)
 		card.setIndex(saved_sdpos);
 		sdpos_atomic = saved_sdpos;
 		card.sdprinting = true;
-		printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
 	}
 	else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing
 		gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing
@@ -9511,6 +9514,7 @@ void restore_print_from_ram_and_continue(float e_move)
 	else {
 		//not sd printing nor usb printing
 	}
+	printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
 	lcd_setstatuspgm(_T(WELCOME_MSG));
 	saved_printing = false;
 }
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 779bee32c..536e96bfd 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -547,7 +547,7 @@ void fanSpeedError(unsigned char _fan) {
 		}
 		else {
 			fan_check_error = EFCE_DETECTED;
-
+      SERIAL_ECHOLNPGM("// action:pause"); //for octoprint
 		}
 	}
 	else {
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e1d9e0abc..e87908867 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6952,7 +6952,6 @@ void lcd_print_stop()
      if(!card.sdprinting)
           {
           SERIAL_ECHOLNPGM("// action:cancel");   // for Octoprint
-          return;
           }
 	saved_printing = false;
 	cancel_heatup = true;