diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 49721cc193..2a0614787e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -104,6 +104,9 @@
 // Heating is finished if a temperature close to this degree shift is reached
 #define HEATING_EARLY_FINISH_DEG_OFFSET 1 //Degree
 
+//Do not wait for M109 to finish when printing from SD card
+//#define STOP_HEATING_WAIT_WHEN_SD_PRINTING
+
 // PID settings:
 // Uncomment the following line to enable PID support.
 #define PIDTEMP
diff --git a/Marlin/cardreader.pde b/Marlin/cardreader.pde
index a1f23ce068..2fefbcf535 100644
--- a/Marlin/cardreader.pde
+++ b/Marlin/cardreader.pde
@@ -444,7 +444,9 @@ void CardReader::printingHasFinished()
  st_synchronize();
  quickStop();
  sdprinting = false;
+ #ifdef STOP_HEATING_WAIT_FOR_SD_PRINTING
  stop_heating_wait=true;
+ #endif
  if(SD_FINISHED_STEPPERRELEASE)
  {
    //finishAndDisableSteppers();