diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index c97137638257f9a288d4ab58a3499ee3dba4ccab..bc62dadaad9fdc7eb8aecf44d1ce6079becd6a1f 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -259,7 +259,7 @@ function remove_rss {
 
     nginx_dissite $RSS_READER_DOMAIN_NAME
     function_check remove_onion_service
-    remove_onion_service rss_mobile ${RSS_MOBILE_READER_ONION_PORT}
+    remove_onion_service mobilerss ${RSS_MOBILE_READER_ONION_PORT}
     remove_onion_service rss ${RSS_READER_ONION_PORT}
     if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then
         rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
@@ -272,6 +272,7 @@ function remove_rss {
     remove_completion_param install_rss
     sed -i '/RSS /d' $COMPLETION_FILE
     sed -i '/rss /d' $COMPLETION_FILE
+    sed -i '/rss_/d' $COMPLETION_FILE
     remove_backup_database_local ttrss
 }
 
@@ -337,7 +338,9 @@ function install_rss_main {
 
     sleep 2
 
-    RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service rss_mobile 80 ${RSS_MOBILE_READER_ONION_PORT})
+    RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT})
+
+    set_completion_param "rss_mobile onion domain" "$RSS_MOBILE_READER_ONION_HOSTNAME"
 
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
     echo "  listen 127.0.0.1:$RSS_MOBILE_READER_ONION_PORT;" >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 953fd43903bba93a2626c8c46d5e7336c9e211be..3131d0a12dacb90399cc63725e57c03c450786ea 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -59,7 +59,7 @@ function wait_for_onion_service_base {
     while [ ! -f ${HIDDEN_SERVICE_PATH}${onion_service_name}/hostname ]; do
         sleep 1
         sleep_ctr=$((sleep_ctr + 1))
-        if [ $sleep_ctr -gt 10 ]; then
+        if [ $sleep_ctr -gt 20 ]; then
             break
         fi
     done