diff --git a/command/payload_cmds.cpp b/command/payload_cmds.cpp
index 683d21a..fb207ac 100644
--- a/command/payload_cmds.cpp
+++ b/command/payload_cmds.cpp
@@ -218,6 +218,11 @@
     auto response =
         reinterpret_cast<GetPayloadInfoResponse*>(outPayload.data());
 
+    if (inPayload.size() != sizeof(GetPayloadInfoRequest))
+    {
+        response->completionCode = IPMI_CC_REQ_DATA_LEN_INVALID;
+        return outPayload;
+    }
     // SOL is the payload currently supported for payload status & only one
     // instance of SOL is supported.
     if (static_cast<uint8_t>(message::PayloadType::SOL) !=
@@ -227,7 +232,6 @@
         response->completionCode = IPMI_CC_INVALID_FIELD_REQUEST;
         return outPayload;
     }
-
     auto status = std::get<sol::Manager&>(singletonPool)
                       .isPayloadActive(request->payloadInstance);