diff --git a/setup/so-setup b/setup/so-setup
index 49d5fd931..9d8675d7d 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -144,7 +144,7 @@ if (whiptail_you_sure) ; then
   if [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
     MASTERUPDATES=OPEN
     filter_unused_nics
-    [[ $SKIP_BOND == no ]] && whiptail_bond_nics
+    [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     whiptail_helix_apikey
     whiptail_homenet_master
     RULESETUP=ETOPEN
@@ -468,7 +468,7 @@ if (whiptail_you_sure) ; then
 
   if [ $INSTALLTYPE == 'SENSOR' ]; then
     filter_unused_nics
-    [[ $SKIP_BOND == no ]] && whiptail_bond_nics
+    [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     whiptail_management_server
     whiptail_master_updates
     set_updates
@@ -559,7 +559,7 @@ if (whiptail_you_sure) ; then
     if [ $INSTALLTYPE == 'EVAL' ]; then
       TYPE='eval'
       # Select which NICs are in the bond
-      [[ $SKIP_BOND == no ]] && whiptail_bond_nics
+      [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     elif [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
       TYPE='mastersearch'
     fi
@@ -849,7 +849,7 @@ if (whiptail_you_sure) ; then
   if [ $INSTALLTYPE == 'HEAVYNODE' ]; then
 
     filter_unused_nics
-    [[ $SKIP_BOND == no ]] && whiptail_bond_nics
+    [[ $SKIP_BOND != 'yes' ]] && whiptail_bond_nics
     whiptail_management_server
     whiptail_master_updates
     set_updates