diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index bfa24a29..e1cba811 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -302,6 +302,8 @@ function install_mediagoblin {
 
     MEDIAGOBLIN_ONION_HOSTNAME=$(add_onion_service mediagoblin 80 ${MEDIAGOBLIN_ONION_PORT})
     set_completion_param "mediagoblin domain" "${MEDIAGOBLIN_DOMAIN_NAME}"
+    set_completion_param "mediagoblin onion domain" "$MEDIAGOBLIN_ONION_HOSTNAME"
+    set_completion_param "mediagoblin commit" "$MEDIAGOBLIN_COMMIT"
 
     if [[ $ONION_ONLY == "no" ]]; then
         function_check nginx_http_redirect
@@ -490,9 +492,6 @@ function install_mediagoblin {
     function_check add_ddns_domain
     add_ddns_domain $MEDIAGOBLIN_DOMAIN_NAME
 
-    set_completion_param "mediagoblin domain" "$MEDIAGOBLIN_DOMAIN_NAME"
-    set_completion_param "mediagoblin commit" "$MEDIAGOBLIN_COMMIT"
-
     APP_INSTALLED=1
 }