diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 65d369d6..c415e3ef 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -284,11 +284,19 @@ function show_domains {
                 onion_address="-"
             fi
 
-            W+=("${app_name}" "${icann_address} / ${onion_address}")
+            if [[ "${icann_address}" != '-' ]]; then
+                W+=("${app_name}" "${icann_address} / ${onion_address}")
+            else
+                W+=("${app_name}" "${onion_address}")
+            fi
 
             if grep -q "mobile${app_name} onion domain" "$COMPLETION_FILE"; then
                 onion_address=$(get_app_onion_address "${app_name}" "mobile")
-                W+=("${app_name} (mobile)" "${icann_address} / ${onion_address}")
+                if [[ "${icann_address}" != '-' ]]; then
+                    W+=("${app_name} (mobile)" "${icann_address} / ${onion_address}")
+                else
+                    W+=("${app_name} (mobile)" "${onion_address}")
+                fi
             fi
         fi
     done