diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index 7530a7a1..a1bdd63a 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -159,26 +159,28 @@ function install_toxid {
 
 function run_tox {
     if [ -f $TOXIC_PATH ]; then
-        # update bootstrap nodes
-        if [ -f $DHTNODES ]; then
-            if [ ! -f $DHTNODES.internet ]; then
-                sudo cp $DHTNODES $DHTNODES.internet
+        if [[ $SERVER_INSTALLATION == "no" ]]; then
+            # update bootstrap nodes
+            if [ -f $DHTNODES ]; then
+                if [ ! -f $DHTNODES.internet ]; then
+                    sudo cp $DHTNODES $DHTNODES.internet
+                fi
             fi
+            lstox -f dht > /tmp/dht
+            sudo cp /tmp/dht $DHTNODES
         fi
-        lstox -f dht > /tmp/dht
-        sudo cp /tmp/dht $DHTNODES
 
         # get a list of peers
         PEER_TOX_ID_LIST=$(lstox | grep $AVAHI_DOMAIN | sort -u)
-        if [ ! $PEER_TOX_ID_LIST ]; then
+        if [ ! "$PEER_TOX_ID_LIST" ]; then
             echo 'No peers found'
             exit 0
         fi
-        PEER_TOX_ID_LIST_COUNT=$(echo $PEER_TOX_ID_LIST | wc -l)
+        PEER_TOX_ID_LIST_COUNT=$(echo "$PEER_TOX_ID_LIST" | wc -l)
         PEER_TOX_ID=''
         if [ $PEER_TOX_ID_LIST_COUNT -lt "2" ]; then
             # single peer
-            PEER_TOX_ID=$(echo $PEER_TOX_ID_LIST | awk -F ' ' '{print $3}')
+            PEER_TOX_ID=$(echo "$PEER_TOX_ID_LIST" | awk -F ' ' '{print $3}')
         else
             # choose a user from a list
             echo ''
@@ -190,7 +192,7 @@ function run_tox {
                 ctr=$((ctr + 1))
             done < "$PEER_TOX_ID_LIST"
             read user_index
-            PEER_TOX_ID=$(echo $PEER_TOX_ID_LIST | tail -n+${user_index} | head -n1 | awk -F ' ' '{print $3}')
+            PEER_TOX_ID=$(echo "$PEER_TOX_ID_LIST" | tail -n+${user_index} | head -n1 | awk -F ' ' '{print $3}')
         fi
 
         # if this is a valid ID