diff --git a/meson.build b/meson.build
index ad1f401..b9f3732 100644
--- a/meson.build
+++ b/meson.build
@@ -80,6 +80,7 @@
   'redfish-dump-log'                            : '-DBMCWEB_ENABLE_REDFISH_DUMP_LOG',
   'redfish-host-logger'                         : '-DBMCWEB_ENABLE_REDFISH_HOST_LOGGER',
   'redfish-new-powersubsystem-thermalsubsystem' : '-DBMCWEB_NEW_POWERSUBSYSTEM_THERMALSUBSYSTEM',
+  'redfish-oem-manager-fan-data'                : '-DBMCWEB_ENABLE_REDFISH_OEM_MANAGER_FAN_DATA',
   'redfish-provisioning-feature'                : '-DBMCWEB_ENABLE_REDFISH_PROVISIONING_FEATURE',
   'redfish-post-to-old-updateservice'           : '-DBMCWEB_ENABLE_REDFISH_UPDATESERVICE_OLD_POST_URL',
   'redfish'                                     : '-DBMCWEB_ENABLE_REDFISH',
diff --git a/meson_options.txt b/meson_options.txt
index a32a4a4..ecc7aeb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -224,6 +224,15 @@
 )
 
 option(
+    'redfish-oem-manager-fan-data',
+    type: 'feature',
+    value: 'enabled',
+    description: '''Enables Redfish OEM fan data on the manager resource.
+                    This includes PID and Stepwise controller data. See
+                    OemManager schema for more detail.'''
+)
+
+option(
     'https_port',
     type: 'integer',
     min: 1,
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index d1e43fb..dcd7876 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -2063,8 +2063,10 @@
         managerDiagnosticData["@odata.id"] =
             "/redfish/v1/Managers/bmc/ManagerDiagnosticData";
 
+#ifdef BMCWEB_ENABLE_REDFISH_OEM_MANAGER_FAN_DATA
         auto pids = std::make_shared<GetPIDValues>(asyncResp);
         pids->run();
+#endif
 
         getMainChassisId(asyncResp,
                          [](const std::string& chassisId,
@@ -2215,6 +2217,7 @@
 
         if (oem)
         {
+#ifdef BMCWEB_ENABLE_REDFISH_OEM_MANAGER_FAN_DATA
             std::optional<nlohmann::json> openbmc;
             if (!redfish::json_util::readJson(*oem, asyncResp->res, "OpenBmc",
                                               openbmc))
@@ -2244,6 +2247,10 @@
                     pid->run();
                 }
             }
+#else
+            messages::propertyUnknown(asyncResp->res, "Oem");
+            return;
+#endif
         }
         if (links)
         {