diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index d5023111..7eb0fe5f 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -42,8 +42,9 @@ CoreController::CoreController(object_id_t objectId)
     if (not BLOCKING_SD_INIT) {
       sdcMan->setBlocking(false);
     }
-    Stopwatch watch;
-    sdcMan->updateSdCardStateFile(true);
+    // Set up state of SD card manager and own initial state.
+    // Stopwatch watch;
+    sdcMan->updateSdCardStateFile();
     sdcMan->updateSdStatePair();
     SdCardManager::SdStatePair sdStates;
     sdcMan->getSdCardsStatus(sdStates);
@@ -323,7 +324,7 @@ ReturnValue_t CoreController::checkModeCommand(Mode_t mode, Submode_t submode,
 
 ReturnValue_t CoreController::initSdCardBlocking() {
   // Create update status file
-  ReturnValue_t result = sdcMan->updateSdCardStateFile(true);
+  ReturnValue_t result = sdcMan->updateSdCardStateFile();
   if (result != returnvalue::OK) {
     sif::warning << "CoreController::initialize: Updating SD card state file failed" << std::endl;
   }
@@ -343,7 +344,7 @@ ReturnValue_t CoreController::initSdCardBlocking() {
               << static_cast<int>(sdInfo.active) << std::endl;
     result = sdColdRedundantBlockingInit();
     // Update status file
-    sdcMan->updateSdCardStateFile(true);
+    sdcMan->updateSdCardStateFile();
     return result;
   }
   if (sdInfo.cfgMode == SdCfgMode::HOT_REDUNDANT) {
@@ -351,7 +352,7 @@ ReturnValue_t CoreController::initSdCardBlocking() {
     sdCardSetup(sd::SdCard::SLOT_0, sd::SdState::MOUNTED, "0", false);
     sdCardSetup(sd::SdCard::SLOT_1, sd::SdState::MOUNTED, "1", false);
     // Update status file
-    sdcMan->updateSdCardStateFile(true);
+    sdcMan->updateSdCardStateFile();
   }
   return returnvalue::OK;
 }
@@ -404,12 +405,14 @@ ReturnValue_t CoreController::sdStateMachine() {
   if (sdFsmState == SdStates::GET_INFO) {
     if (not sdInfo.commandExecuted) {
       // Create updated status file
-      result = sdcMan->updateSdCardStateFile(false);
+      result = sdcMan->updateSdCardStateFile();
       if (result != returnvalue::OK) {
         sif::warning << "CoreController::sdStateMachine: Updating SD card state file failed"
                      << std::endl;
       }
-      sdInfo.commandExecuted = true;
+      sdFsmState = SdStates::SET_STATE_SELF;
+      sdInfo.commandExecuted = false;
+      sdInfo.cycleCount = 0;
     } else {
       nonBlockingOpChecking(SdStates::SET_STATE_SELF, 4, "Updating SDC file");
     }
@@ -553,7 +556,7 @@ ReturnValue_t CoreController::sdStateMachine() {
     sdFsmState = SdStates::UPDATE_INFO;
   } else if (sdFsmState == SdStates::UPDATE_INFO) {
     // Update status file
-    result = sdcMan->updateSdCardStateFile(true);
+    result = sdcMan->updateSdCardStateFile();
     if (result != returnvalue::OK) {
       sif::warning << "CoreController::initialize: Updating SD card state file failed" << std::endl;
     }
diff --git a/bsp_q7s/fs/SdCardManager.cpp b/bsp_q7s/fs/SdCardManager.cpp
index 1f5df765..e954e7bb 100644
--- a/bsp_q7s/fs/SdCardManager.cpp
+++ b/bsp_q7s/fs/SdCardManager.cpp
@@ -406,14 +406,14 @@ ReturnValue_t SdCardManager::setPreferredSdCard(sd::SdCard sdCard) {
   return scratch::writeNumber(scratch::PREFERED_SDC_KEY, static_cast<uint8_t>(sdCard));
 }
 
-ReturnValue_t SdCardManager::updateSdCardStateFile(bool blocking) {
+ReturnValue_t SdCardManager::updateSdCardStateFile() {
   if (cmdExecutor.getCurrentState() == CommandExecutor::States::PENDING) {
     return CommandExecutor::COMMAND_PENDING;
   }
   MutexGuard mg(sdLock, LOCK_TYPE, SD_LOCK_TIMEOUT, LOCK_CTX);
   // Use q7hw utility and pipe the command output into the state file
   std::string updateCmd = "q7hw sd info all > " + std::string(SD_STATE_FILE);
-  cmdExecutor.load(updateCmd, blocking, printCmdOutput);
+  cmdExecutor.load(updateCmd, true, printCmdOutput);
   ReturnValue_t result = cmdExecutor.execute();
   if (blocking and result != returnvalue::OK) {
     utility::handleSystemError(cmdExecutor.getLastError(), "SdCardManager::mountSdCard");
diff --git a/bsp_q7s/fs/SdCardManager.h b/bsp_q7s/fs/SdCardManager.h
index adc44bb8..cee06894 100644
--- a/bsp_q7s/fs/SdCardManager.h
+++ b/bsp_q7s/fs/SdCardManager.h
@@ -125,7 +125,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
    *  - CommandExecutor::COMMAND_PENDING: Non-blocking command is pending
    *  - returnvalue::FAILED: blocking command failed
    */
-  ReturnValue_t updateSdCardStateFile(bool blocking);
+  ReturnValue_t updateSdCardStateFile();
 
   /**
    * Get the state of the SD cards. If the state file does not exist, this function will