diff --git a/src/biosconfigcommands.cpp b/src/biosconfigcommands.cpp
index 805306e..83b8959 100644
--- a/src/biosconfigcommands.cpp
+++ b/src/biosconfigcommands.cpp
@@ -105,7 +105,8 @@
 {
     GetPayloadInfo = 0, // 0
     GetPayloadData = 1, // 1
-    GetPayloadStatus = 2
+    GetPayloadStatus = 2,
+    MaxPayloadParameters
 };
 
 namespace payload1
@@ -927,6 +928,12 @@
     //      1-OOB BIOS config is supported
     message::Payload retValue;
 
+    if (static_cast<GetPayloadParameter>(paramSel) >=
+        ipmi::GetPayloadParameter::MaxPayloadParameters)
+    {
+        return ipmi::responseInvalidFieldRequest();
+    }
+
     if (!(gNVOOBdata.mBIOSCapabilities.OOBCapability & (biosCapOffsetBit)))
     {
         return ipmi::response(ipmiCCBIOSCapabilityInitNotDone);