diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 4779f121..598960ea 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -626,6 +626,8 @@ function install_tahoelafs {
     su -c '/home/tahoelafs/tahoelafs/venv/bin/python2 /home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/storage' - tahoelafs
     create_tahoelafs_daemon "storage"
 
+    # start the client
+    su -c '/home/tahoelafs/tahoelafs/venv/bin/python2 /home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/client' - tahoelafs
     add_tahoelafs_server "$(get_tahoelafs_storage_hostname)" "$(get_tahoelafs_public_key)" "${node_nick}" "$(get_tahoelafs_furl)"
     if ! grep -q "HidServAuth $(get_tahoelafs_storage_hostname)" /etc/tor/torrc; then
         echo $'Unable to create tahoelafs server'
@@ -635,9 +637,6 @@ function install_tahoelafs {
         echo $'tahoelafs server file missing'
         exit 529362
     fi
-
-    # start the client
-    su -c '/home/tahoelafs/tahoelafs/venv/bin/python2 /home/tahoelafs/tahoelafs/venv/bin/tahoe start /home/tahoelafs/client' - tahoelafs
     create_tahoelafs_daemon "client"
 
     set_completion_param "tahoelafs commit" "$TAHOELAFS_COMMIT"