diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 92f733787a..ebb82cfb25 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -971,6 +971,7 @@ void GCode::_do_export(Print &print, FILE *file)
 
                 _write(file, "; thumbnail end\n;\n\n");
             }
+            print.throw_if_canceled();
         }
     }
 #endif // ENABLE_THUMBNAIL_GENERATOR
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f56d6fc278..464093712e 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -3046,7 +3046,8 @@ bool Plater::priv::restart_background_process(unsigned int state)
            (state & UPDATE_BACKGROUND_PROCESS_FORCE_EXPORT) != 0 ||
            (state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 ) ) {
 #if ENABLE_THUMBNAIL_GENERATOR
-        if ((state & UPDATE_BACKGROUND_PROCESS_FORCE_EXPORT) == 0)
+        if (((state & UPDATE_BACKGROUND_PROCESS_FORCE_EXPORT) == 0) &&
+             (this->background_process.state() != BackgroundSlicingProcess::STATE_RUNNING))
         {
             // update thumbnail data
             if (this->printer_technology == ptFFF)