diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 61315acc14..93b1a3811c 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -9,7 +9,9 @@ LOCKFILE="/tmp/swss-syncd-lock$DEV"
 NAMESPACE_PREFIX="asic"
 ETC_SONIC_PATH="/etc/sonic/"
 
-DEPENDENT="radv bgp"
+# DEPENDENT initially contains namespace independent services
+# namespace specific services are added later in this script.
+DEPENDENT="radv"
 MULTI_INST_DEPENDENT="teamd"
 
 . /usr/local/bin/asic_status.sh
@@ -309,9 +311,11 @@ function check_peer_gbsyncd()
 if [ "$DEV" ]; then
     NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
     SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
+    DEPENDENT+=" bgp@${DEV}"
 else
     NET_NS=""
     SONIC_DB_CLI="sonic-db-cli"
+    DEPENDENT+=" bgp"
 fi
 
 check_peer_gbsyncd