diff --git a/src/rest/api/api_printer.lua b/src/rest/api/api_printer.lua
index 4e5467e..2cf5710 100644
--- a/src/rest/api/api_printer.lua
+++ b/src/rest/api/api_printer.lua
@@ -74,6 +74,7 @@ end
 local function stopFetch()
         io.popen("killall print-fetch"):close()
 	io.popen("rm /tmp/startcode /tmp/endcode"):close()
+	setCurrentPrint(nil)
 end
 
 function M.progress(request, response)
@@ -191,7 +192,6 @@ function M.stop_POST(request, response)
 	if not printer or not printer:hasSocket() then return end
 
 	stopFetch()
-	setCurrentPrint(nil)
 
 	if(argGcode == nil) then
 		argGcode = ""