diff --git a/files/scripts/gbsyncd.sh b/files/scripts/gbsyncd.sh
index 0990de5d8257..a7eaaced0cd6 100755
--- a/files/scripts/gbsyncd.sh
+++ b/files/scripts/gbsyncd.sh
@@ -3,11 +3,15 @@
 . /usr/local/bin/syncd_common.sh
 
 function startplatform() {
-    # Add gbsyncd to FEATURE table, if not in. It did have same config as syncd.
-    if [ -z $($SONIC_DB_CLI CONFIG_DB HGET 'FEATURE|gbsyncd' state) ]; then
-        local CMD="local r=redis.call('DUMP', KEYS[1]); redis.call('RESTORE', KEYS[2], 0, r)"
-        $SONIC_DB_CLI CONFIG_DB EVAL "$CMD" 2 'FEATURE|syncd' 'FEATURE|gbsyncd'
-    fi
+
+    declare -a DbCliArray=($SONIC_DB_CLI $SONIC_DB_NS_CLI)
+    for DB_CLI in  ${DbCliArray[@]}; do
+        # Add gbsyncd to FEATURE table, if not in. It did have same config as syncd.
+        if [ -z $($DB_CLI CONFIG_DB HGET 'FEATURE|gbsyncd' state) ]; then
+            local CMD="local r=redis.call('DUMP', KEYS[1]); redis.call('RESTORE', KEYS[2], 0, r)"
+            $DB_CLI CONFIG_DB EVAL "$CMD" 2 'FEATURE|syncd' 'FEATURE|gbsyncd'
+        fi
+    done
 }
 
 function waitplatform() {
@@ -30,12 +34,11 @@ PEER="swss"
 DEBUGLOG="/tmp/swss-$SERVICE-debug$DEV.log"
 LOCKFILE="/tmp/swss-$SERVICE-lock$DEV"
 NAMESPACE_PREFIX="asic"
+SONIC_DB_CLI="sonic-db-cli"
+SONIC_DB_NS_CLI="sonic-db-cli"
 if [ "$DEV" ]; then
     NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
-    SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
-else
-    NET_NS=""
-    SONIC_DB_CLI="sonic-db-cli"
+    SONIC_DB_NS_CLI="sonic-db-cli -n $NET_NS"
 fi
 
 case "$1" in