diff --git a/src/rest/api/api_printer.lua b/src/rest/api/api_printer.lua
index b4d085f..bc90205 100644
--- a/src/rest/api/api_printer.lua
+++ b/src/rest/api/api_printer.lua
@@ -106,6 +106,8 @@ end
 
 function M.stop_POST(request, response)
 
+	log:info("API:printer/stop")
+
 	if not accessManager.hasControl(request.remoteAddress) then
 		response:setFail("No control access")
 		return
@@ -114,8 +116,14 @@ function M.stop_POST(request, response)
 	local argId = request:get("id")
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
 	if not printer then return end
-
-	local endGcode = settings.get('printer.endgcode')
+	
+	-- replacing {printingTemp} and {preheatTemp} in endgcode
+	local printingTemperature  	  = settings.get('printer.temperature')
+	local preheatTemperature      = settings.get('printer.heatup.temperature')
+	local endGcode 				  = settings.get('printer.endgcode')
+	endGcode = string.gsub(endGcode,"{printingTemp}",printingTemperature)
+	endGcode = string.gsub(endGcode,"{preheatTemp}",preheatTemperature)
+	
 	local rv,msg = printer:stopPrint(endGcode)
 
 	response:addData('id', argId)