diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bbf250..f6e5034 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,9 +110,12 @@
         "Enables unsecure features required by validation. Note: must
         be turned off for production images."
         OFF)
+option (MDR_V1_SUPPORT "Support these MDR Verseion 1 IPMI OEM commands" OFF)
+
 target_compile_definitions (
     zinteloemcmds PRIVATE
     $<$<BOOL:${INTEL_PFR_ENABLED}>: -DINTEL_PFR_ENABLED>
     $<$<BOOL:${BMC_VALIDATION_UNSECURE_FEATURE}>:
     -DBMC_VALIDATION_UNSECURE_FEATURE>
+    $<$<BOOL:${MDR_V1_SUPPORT}>: -DMDR_V1_SUPPORT>
 )
diff --git a/src/smbioshandler.cpp b/src/smbioshandler.cpp
index 835302a..9ed05c2 100644
--- a/src/smbioshandler.cpp
+++ b/src/smbioshandler.cpp
@@ -477,6 +477,7 @@
 
 static void register_netfn_smbios_functions(void)
 {
+#ifdef MDR_V1_SUPPORT
     // MDR V1 Command
     // <Get MDR Status Command>
     ipmi_register_callback(ipmi::intel::netFnApp,
@@ -499,4 +500,5 @@
     // <Lock MDR Command>
     ipmi_register_callback(ipmi::intel::netFnApp, ipmi::intel::app::cmdMdrLock,
                            NULL, cmd_region_lock, PRIVILEGE_OPERATOR);
+#endif
 }