diff --git a/Tests/scheduler/create_flats.esq b/Tests/scheduler/create_flats.esq
new file mode 100644
--- /dev/null
+++ b/Tests/scheduler/create_flats.esq
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SequenceQueue version='2'>
+<CCD>CCD Simulator</CCD>
+<FilterWheel>CCD Simulator</FilterWheel>
+<GuideDeviation enabled='false'>4</GuideDeviation>
+<Autofocus enabled='false'>0</Autofocus>
+<RefocusEveryN enabled='false'>60</RefocusEveryN>
+<MeridianFlip enabled='false'>0</MeridianFlip>
+<Job>
+<Exposure>0.5</Exposure>
+<Binning>
+<X>1</X>
+<Y>1</Y>
+</Binning>
+<Frame>
+<X>0</X>
+<Y>0</Y>
+<W>1280</W>
+<H>1024</H>
+</Frame>
+<Temperature force='false'>0</Temperature>
+<Filter>Luminance</Filter>
+<Type>Flat</Type>
+<Prefix>
+<RawPrefix></RawPrefix>
+<FilterEnabled>0</FilterEnabled>
+<ExpEnabled>0</ExpEnabled>
+<TimeStampEnabled>0</TimeStampEnabled>
+</Prefix>
+<Count>3</Count>
+<Delay>0</Delay>
+<FITSDirectory>/var/tmp/kstars_tests</FITSDirectory>
+<UploadMode>0</UploadMode>
+<FormatIndex>0</FormatIndex>
+<Properties>
+</Properties>
+<Calibration>
+<FlatSource>
+<Type>Manual</Type>
+</FlatSource>
+<FlatDuration>
+<Type>ADU</Type>
+<Value>10000</Value>
+<Tolerance>2000</Tolerance>
+</FlatDuration>
+<PreMountPark>False</PreMountPark>
+<PreDomePark>False</PreDomePark>
+</Calibration>
+</Job>
+</SequenceQueue>
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -1181,8 +1181,8 @@
     if (activeJob->getExposure() >= 1)
         KSNotification::event(QLatin1String("EkosCaptureImageReceived"), i18n("Captured image received"), KSNotification::EVENT_INFO);
 
-    // If it was initially set as preview job
-    if (activeJob->isPreview())
+    // If it was initially set as pure preview job and NOT as preview for calibration
+    if (activeJob->isPreview() && calibrationStage != CAL_CALIBRATION)
     {
         jobs.removeOne(activeJob);
         // Reset upload mode if it was changed by preview
@@ -1208,7 +1208,8 @@
     }
 
     /* Increase the sequence's current capture count */
-    activeJob->setCompleted(activeJob->getCompleted() + 1);
+    if (! activeJob->isPreview())
+        activeJob->setCompleted(activeJob->getCompleted() + 1);
 
     /* If we were assigned a captured frame map, also increase the relevant counter for prepareJob */
     SchedulerJob::CapturedFramesMap::iterator frame_item = capturedFramesMap.find(activeJob->getSignature());