diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 0be16ee..a85b872 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -54,6 +54,9 @@
         case SmSignalGet::smNMIButton:
             path = "/xyz/openbmc_project/chassis/buttons/nmi";
             break;
+        case SmSignalGet::smIdentifyButton:
+            path = "/xyz/openbmc_project/chassis/buttons/id";
+            break;
         default:
             return -1;
             break;
@@ -306,10 +309,20 @@
             return ipmi::responseSuccess(sensorVal, fanTach);
         }
         break;
+        case SmSignalGet::smIdentifyButton:
+        {
+            if (action == SmActionGet::revert || action == SmActionGet::ignore)
+            {
+                // ButtonMasked property is not supported for ID button as it is
+                // unnecessary. Hence if requested for revert / ignore, override
+                // it to sample action to make tools happy.
+                action = SmActionGet::sample;
+            }
+            // fall-through
+        }
         case SmSignalGet::smResetButton:
         case SmSignalGet::smPowerButton:
         case SmSignalGet::smNMIButton:
-        case SmSignalGet::smIdentifyButton:
         {
             std::string path;
             if (getGpioPathForSmSignal(signalType, path) < 0)