diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
old mode 100644
new mode 100755
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -3483,6 +3483,7 @@
 
 void Capture::setMeridianFlipStage(MFStage status)
 {
+    qCDebug(KSTARS_EKOS_CAPTURE) << "setMeridianFlipStage: " << status;
     if (meridianFlipStage != status)
     {
         switch (status)
@@ -3544,6 +3545,7 @@
 
 void Capture::meridianFlipStatusChanged(Mount::MeridianFlipStatus status)
 {
+    qCDebug(KSTARS_EKOS_CAPTURE) << "meridianFlipStatusChanged: " << status;
     switch (status)
     {
         case Mount::FLIP_NONE:
diff --git a/kstars/ekos/capture/sequencejob.cpp b/kstars/ekos/capture/sequencejob.cpp
old mode 100644
new mode 100755
--- a/kstars/ekos/capture/sequencejob.cpp
+++ b/kstars/ekos/capture/sequencejob.cpp
@@ -75,29 +75,8 @@
 
     activeChip->setBatchMode(!preview);
 
-    // Check if we need to change filter wheel
-    if (frameType == FRAME_LIGHT && targetFilter != -1 && activeFilter != nullptr)
-    {
-        if (targetFilter == currentFilter)
-            prepareActions[ACTION_FILTER] = true;
-        else
-        {
-            prepareActions[ACTION_FILTER] = false;
-
-            emit prepareState(CAPTURE_CHANGING_FILTER);
-
-            FilterManager::FilterPolicy policy = FilterManager::ALL_POLICIES;
-            // Don't perform autofocus on preview
-            if (isPreview())
-                policy = static_cast<FilterManager::FilterPolicy>(policy & ~FilterManager::AUTOFOCUS_POLICY);
-
-            filterManager->setFilterPosition(targetFilter, policy);
-        }
-    }
-    else
-    {
-        prepareActions[ACTION_FILTER] = true;
-    }
+    // Filter changes are done in capture();
+    prepareActions[ACTION_FILTER] = true;
 
     // Check if we need to update temperature
     if (enforceTemperature && fabs(targetTemperature - currentTemperature) > Options::maxTemperatureDiff())
@@ -272,9 +251,11 @@
     {
         if (targetFilter != currentFilter)
         {
+            emit prepareState(CAPTURE_CHANGING_FILTER);
+
             FilterManager::FilterPolicy policy = FilterManager::ALL_POLICIES;
-            // Don't perform autofocus on preview
-            if (isPreview())
+            // Don't perform autofocus on preview or calibration frames.
+            if (isPreview() || frameType != FRAME_LIGHT)
                 policy = static_cast<FilterManager::FilterPolicy>(policy & ~FilterManager::AUTOFOCUS_POLICY);
 
             filterManager->setFilterPosition(targetFilter, policy);