diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 56f7933..aa2e266 100644
--- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -18,5 +18,9 @@
   jq --slurpfile brcfg ${WORKDIR}/gbmc_bridge.json \
     '. + {"${GBMCBR_IPMI_CHANNEL}": $brcfg[0]}' $chjson >${WORKDIR}/tmp
   mv ${WORKDIR}/tmp $chjson
+
+  # 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
 }