diff --git a/dockers/docker-orchagent/docker-init.j2 b/dockers/docker-orchagent/docker-init.j2
index 5b3850613dac..d0a3ef9e2d36 100755
--- a/dockers/docker-orchagent/docker-init.j2
+++ b/dockers/docker-orchagent/docker-init.j2
@@ -40,4 +40,21 @@ if [ "$VLAN" != "" ]; then
     cp /usr/share/sonic/templates/ndppd.conf /etc/supervisor/conf.d/
 fi
 
+USE_PCI_ID_IN_CHASSIS_STATE_DB=/usr/share/sonic/platform/use_pci_id_chassis
+ASIC_ID="asic$NAMESPACE_ID"
+if [ -f "$USE_PCI_ID_IN_CHASSIS_STATE_DB" ]; then
+    while true; do
+        PCI_ID=$(sonic-db-cli -s CHASSIS_STATE_DB HGET "CHASSIS_ASIC_TABLE|$ASIC_ID" asic_pci_address)
+        if [ -z "$PCI_ID" ]; then
+            sleep 3
+        else
+            # Update asic_id in CONFIG_DB, which is used by orchagent and fed to syncd
+            if [[ $PCI_ID == ????:??:??.? ]]; then
+                sonic-db-cli CONFIG_DB HSET 'DEVICE_METADATA|localhost' 'asic_id' ${PCI_ID#*:}
+                break
+            fi
+        fi
+    done
+fi
+
 exec /usr/local/bin/supervisord