diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 662e2365079ab180fda51ca15ed221e70f499b4a..fd82fe10ed8be462b816b872bcfcadd264927d36 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -439,13 +439,17 @@ function web_admin_create_installed_apps {
                     fi
 
                     read_config_param "${app_name_upper}_DOMAIN_NAME"
-                    test_domain_name="${app_name_upper}_DOMAIN_NAME"
-                    domain_name=${!test_domain_name}
+                    if [[ "$ONION_ONLY" == 'no' ]]; then
+                        test_domain_name="${app_name_upper}_DOMAIN_NAME"
+                        domain_name=${!test_domain_name}
+                    else
+                        domain_name=$(cat "/var/lib/tor/hidden_service_${app_name}/hostname")
+                    fi
                     if [ "$domain_name" ]; then
                         if [[ "$domain_name" != *'.onion' ]]; then
                             domain_name="https://${!test_domain_name}"
                         else
-                            domain_name="http://${!test_domain_name}"
+                            domain_name="http://${test_domain_name}"
                         fi
                     fi