diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp
index c49192a7..1cc2cd39 100644
--- a/mission/devices/ScexDeviceHandler.cpp
+++ b/mission/devices/ScexDeviceHandler.cpp
@@ -98,7 +98,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       updatePeriodicReply(true, deviceCommand);
-      finishAction(true, deviceCommand, OK);
       break;
     }
     case (ONE_CELL): {
@@ -108,7 +107,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       updatePeriodicReply(true, deviceCommand);
-      finishAction(true, deviceCommand, OK);
       break;
     }
     case (ALL_CELLS_CMD): {
@@ -117,7 +115,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
-      finishAction(true, deviceCommand, OK);
       updatePeriodicReply(true, deviceCommand);
       break;
     }
@@ -175,14 +172,17 @@ ReturnValue_t ScexDeviceHandler::handleValidReply(size_t remSize, DeviceCommandI
         sif::info << "ScexDeviceHandler::handleValidReply: RemMillis: " << remainingMillis
                   << std::endl;
       }
+      finishAction(true, helper.getCmd(), OK);
       result = APERIODIC_REPLY;
       break;
     }
     case (ONE_CELL): {
+      finishAction(true, helper.getCmd(), OK);
       result = APERIODIC_REPLY;
       break;
     }
     case (ALL_CELLS_CMD): {
+      finishAction(true, helper.getCmd(), OK);
       result = APERIODIC_REPLY;
       break;
     }