diff --git a/files/image_config/config-setup/config-setup b/files/image_config/config-setup/config-setup
index b151437b9e..7ddf4530fe 100755
--- a/files/image_config/config-setup/config-setup
+++ b/files/image_config/config-setup/config-setup
@@ -109,7 +109,15 @@ run_hookdir() {
 reload_minigraph()
 {
     echo "Reloading minigraph..."
-    config load_minigraph -y -n 
+    if
+    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.subtype | tr [:upper:] [:lower:])" == *"dualtor"* ]] ||
+    [[ "$(sonic-cfggen -d -v DEVICE_METADATA.localhost.type | tr [:upper:] [:lower:])" == *"leafrouter"* ]];
+    then
+        #Keep device isolated with traffic-shift-away option on LeafRouter and Dualtor
+        config load_minigraph -y -n -t
+    else
+        config load_minigraph -y -n
+    fi
     config save -y
 }