diff --git a/bsp_q7s/obsw.cpp b/bsp_q7s/obsw.cpp
index 60ededab..5cf1849a 100644
--- a/bsp_q7s/obsw.cpp
+++ b/bsp_q7s/obsw.cpp
@@ -92,9 +92,9 @@ void obsw::autoSwitchHandling() {
     sif::warning << "Detected ASWI=" << autoSwitchTarget
                  << " in ProASIC scratch buffer, auto-switching to image " << int(chip) << " "
                  << int(copy) << std::endl;
+    scratch::clearValue(scratch::AUTO_SWITCH_IMAGE);
     // A bit of delay to ensure printout works..
     TaskFactory::delayTask(500);
-    scratch::clearValue(scratch::AUTO_SWITCH_IMAGE);
     xsc_boot_copy(chip, copy);
   };
   if (scratch::readString(scratch::AUTO_SWITCH_IMAGE, autoSwitchTarget) == returnvalue::OK) {