diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index 261e68d5..bef549b3 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -481,9 +481,19 @@ function install_scuttlebot {
         exit 73528
     fi
 
-    { echo '{';
-      echo "  \"host\": \"${DEFAULT_DOMAIN_NAME}\",";
-      echo "  \"port\": ${SCUTTLEBOT_PORT},";
+    SCUTTLEBOT_ONION_HOSTNAME=$(add_onion_service scuttlebot 80 ${SCUTTLEBOT_ONION_PORT})
+
+    if [[ "$ONION_ONLY" == 'no' ]]; then
+        { echo '{';
+          echo "  \"host\": \"${DEFAULT_DOMAIN_NAME}\",";
+          echo '  "tor-only": false,'; } > /etc/scuttlebot/.ssb/config
+    else
+        { echo '{';
+          echo "  \"host\": \"${SCUTTLEBOT_ONION_HOSTNAME}\",";
+          echo '  "tor-only": true,'; } > /etc/scuttlebot/.ssb/config
+    fi
+
+    { echo "  \"port\": ${SCUTTLEBOT_PORT},";
       echo '  "timeout": 30000,';
       echo '  "pub": true,';
       echo '  "local": true,';
@@ -498,15 +508,13 @@ function install_scuttlebot {
       echo '  "logging": {';
       echo '    "level": "error"';
       echo '  }';
-      echo '}'; } > /etc/scuttlebot/.ssb/config
+      echo '}'; } >> /etc/scuttlebot/.ssb/config
     chown scuttlebot:scuttlebot /etc/scuttlebot/.ssb/config
     systemctl restart scuttlebot.service
 
     firewall_add scuttlebot ${SCUTTLEBOT_PORT}
     firewall_add git_ssb ${GIT_SSB_PORT}
 
-
-    SCUTTLEBOT_ONION_HOSTNAME=$(add_onion_service scuttlebot 80 ${SCUTTLEBOT_ONION_PORT})
     scuttlebot_git_setup
     git_ssb_script