diff --git a/linux/payload/PlocSupervisorHandler.cpp b/linux/payload/PlocSupervisorHandler.cpp
index 5bb68d9d..6bd57a70 100644
--- a/linux/payload/PlocSupervisorHandler.cpp
+++ b/linux/payload/PlocSupervisorHandler.cpp
@@ -175,7 +175,7 @@ void PlocSupervisorHandler::doShutDown() {
 ReturnValue_t PlocSupervisorHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
   if (not commandIsExecuting(GET_HK_REPORT)) {
     *id = GET_HK_REPORT;
-    return OK;
+    return buildCommandFromCommand(*id, nullptr, 0);
   }
   return NOTHING_TO_SEND;
 }
@@ -927,7 +927,7 @@ ReturnValue_t PlocSupervisorHandler::handleExecutionReport(const uint8_t* data)
 ReturnValue_t PlocSupervisorHandler::handleHkReport(const uint8_t* data) {
   ReturnValue_t result = returnvalue::OK;
 
-  result = verifyPacket(data, supv::SIZE_HK_REPORT);
+  result = verifyPacket(data, tmReader.getFullPacketLen());
 
   if (result == result::CRC_FAILURE) {
     sif::error << "PlocSupervisorHandler::handleHkReport: Hk report has invalid crc" << std::endl;
diff --git a/linux/payload/plocSupvDefs.h b/linux/payload/plocSupvDefs.h
index d3fda3da..907bfe0c 100644
--- a/linux/payload/plocSupvDefs.h
+++ b/linux/payload/plocSupvDefs.h
@@ -139,7 +139,6 @@ enum ReplyId : DeviceCommandId_t {
 // Size of complete space packet (6 byte header + size of data + 2 byte CRC)
 static const uint16_t SIZE_ACK_REPORT = 14;
 static const uint16_t SIZE_EXE_REPORT = 14;
-static const uint16_t SIZE_HK_REPORT = 52;
 static const uint16_t SIZE_BOOT_STATUS_REPORT = 24;
 static const uint16_t SIZE_LATCHUP_STATUS_REPORT = 31;
 static const uint16_t SIZE_LOGGING_REPORT = 73;
diff --git a/tmtc b/tmtc
index bc1a1774..2f8bed45 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit bc1a1774a6ace986ec6a3acecb150b7c1d813fce
+Subproject commit 2f8bed4581e05628a3945756cef57ea1602514cb