diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index aa2e266..58997ee 100644
--- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -6,6 +6,8 @@
 
 GBMCBR_IPMI_CHANNEL ?= "11"
 
+ENTITY_MAPPING ?= "default"
+
 # Replace a channel in config.json to add gbmcbr reporting
 do_install:append:gbmc() {
   chjson=${D}${datadir}/ipmi-providers/channel_config.json
@@ -21,6 +23,8 @@
 
   # Set entity-map.json to empty json for gBMC by default.
   # Each system will override it if needed.
-  echo "[]" > ${D}${datadir}/ipmi-providers/entity-map.json
+  if [[ "${ENTITY_MAPPING}" != "default" ]]; then
+    echo "[]" > ${D}${datadir}/ipmi-providers/entity-map.json
+  fi
 }