diff --git a/src/freedombone-installer b/src/freedombone-installer
index a3b5cab952b564ebee487bd115363908250e8d68..2b0246d9c8d2194c2c8ddd00da149a300f7e35e5 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -346,16 +346,18 @@ do
     if [ -f /tmp/.upgrading ]; then
         sleep 2
     else
-        if [ -f "$setup_file" ]; then
-            update_progress_bar
-            before_setup_runs
-            after_setup_has_finished
-            sleep 1
-        else
-            if [ ! -f "$webadmin_install_dir/setup.prev" ]; then
-                install_apps_from_webadmin
+        if [ -d "$webadmin_install_dir" ]; then
+            if [ -f "$setup_file" ]; then
+                update_progress_bar
+                before_setup_runs
+                after_setup_has_finished
                 sleep 1
-                remove_apps_from_webadmin
+            else
+                if [ ! -f "$webadmin_install_dir/setup.prev" ]; then
+                    install_apps_from_webadmin
+                    sleep 1
+                    remove_apps_from_webadmin
+                fi
             fi
         fi
         sleep 1