diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index e25e40d..89269cd 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -1781,6 +1781,13 @@
 
 ipmi::RspType<> ipmiOEMSetFanSpeedOffset(uint8_t offset)
 {
+    constexpr uint8_t maxFanSpeedOffset = 100;
+    if (offset > maxFanSpeedOffset)
+    {
+        phosphor::logging::log<phosphor::logging::level::ERR>(
+            "ipmiOEMSetFanSpeedOffset: fan offset greater than limit");
+        return ipmi::responseInvalidFieldRequest();
+    }
     boost::container::flat_map<std::string, PropertyMap> data = getPidConfigs();
     if (data.empty())
     {