diff --git a/linux/payload/PlocMpsocHandler.cpp b/linux/payload/PlocMpsocHandler.cpp
index 00b0081e..cdf59c52 100644
--- a/linux/payload/PlocMpsocHandler.cpp
+++ b/linux/payload/PlocMpsocHandler.cpp
@@ -654,6 +654,10 @@ ReturnValue_t PlocMpsocHandler::prepareTcGetHkReport() {
 ReturnValue_t PlocMpsocHandler::prepareTcReplayWriteSequence(const uint8_t* commandData,
                                                              size_t commandDataLen) {
   mpsoc::TcReplayWriteSeq tcReplayWriteSeq(spParams, sequenceCount);
+  ReturnValue_t result = tcReplayWriteSeq.setPayload(commandData, commandDataLen);
+  if (result != returnvalue::OK) {
+    return result;
+  }
   finishTcPrep(tcReplayWriteSeq);
   return returnvalue::OK;
 }
@@ -673,6 +677,10 @@ ReturnValue_t PlocMpsocHandler::prepareTcModeIdle() {
 ReturnValue_t PlocMpsocHandler::prepareTcCamCmdSend(const uint8_t* commandData,
                                                     size_t commandDataLen) {
   mpsoc::TcCamcmdSend tcCamCmdSend(spParams, sequenceCount);
+  ReturnValue_t result = tcCamCmdSend.setPayload(commandData, commandDataLen);
+  if (result != returnvalue::OK) {
+    return result;
+  }
   finishTcPrep(tcCamCmdSend);
   nextReplyId = mpsoc::TM_CAM_CMD_RPT;
   return returnvalue::OK;
@@ -681,6 +689,10 @@ ReturnValue_t PlocMpsocHandler::prepareTcCamCmdSend(const uint8_t* commandData,
 ReturnValue_t PlocMpsocHandler::prepareTcCamTakePic(const uint8_t* commandData,
                                                     size_t commandDataLen) {
   mpsoc::TcCamTakePic tcCamTakePic(spParams, sequenceCount);
+  ReturnValue_t result = tcCamTakePic.setPayload(commandData, commandDataLen);
+  if (result != returnvalue::OK) {
+    return result;
+  }
   finishTcPrep(tcCamTakePic);
   return returnvalue::OK;
 }