diff --git a/linux/payload/PlocMpsocHandler.cpp b/linux/payload/PlocMpsocHandler.cpp
index 94fe4588..eedfb95e 100644
--- a/linux/payload/PlocMpsocHandler.cpp
+++ b/linux/payload/PlocMpsocHandler.cpp
@@ -91,6 +91,8 @@ ReturnValue_t PlocMpsocHandler::initialize() {
 
 void PlocMpsocHandler::performOperationHook() {
   if (commandIsPending and cmdCountdown.hasTimedOut()) {
+    sif::warning << "PlocMpsocHandler: Command " << getPendingCommand() << " has timed out"
+                 << std::endl;
     commandIsPending = false;
     // TODO: Better returnvalue?
     cmdDoneHandler(false, returnvalue::FAILED);
@@ -215,7 +217,6 @@ ReturnValue_t PlocMpsocHandler::buildNormalDeviceCommand(DeviceCommandId_t* id)
   if (not commandIsPending and not specialComHelperExecuting) {
     *id = mpsoc::TC_GET_HK_REPORT;
     commandIsPending = true;
-    cmdCountdown.resetTimer();
     return buildCommandFromCommand(*id, nullptr, 0);
   }
   return NOTHING_TO_SEND;
@@ -713,6 +714,7 @@ ReturnValue_t PlocMpsocHandler::finishTcPrep(mpsoc::TcBase& tcBase) {
                << " Size " << std::dec << tcBase.getFullPacketLen() << " SSC "
                << tcBase.getSeqCount() << std::endl;
   }
+  cmdCountdown.resetTimer();
   return returnvalue::OK;
 }
 
diff --git a/linux/payload/PlocMpsocHandler.h b/linux/payload/PlocMpsocHandler.h
index 6cce4951..216001d6 100644
--- a/linux/payload/PlocMpsocHandler.h
+++ b/linux/payload/PlocMpsocHandler.h
@@ -186,7 +186,7 @@ class PlocMpsocHandler : public DeviceHandlerBase, public CommandsActionsIF {
   };
 
   TmMemReadReport tmMemReadReport;
-  Countdown cmdCountdown = Countdown(10000);
+  Countdown cmdCountdown = Countdown(12000);
 
   struct TelemetryBuffer {
     uint16_t length = 0;