diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index aad8abb2..cf68a2b1 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -173,7 +173,7 @@ function matrix_nginx {
     systemctl restart nginx
 
     # wait for nginx to start otherwise user add fails later
-    sleep 5
+    sleep 8
 }
 
 function matrix_generate_homeserver_file {
@@ -418,6 +418,8 @@ function remove_matrix {
     remove_onion_service matrix ${MATRIX_PORT}
 
     sed -i "/location \/matrix {/,/}/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
+    sed -i "/location \/matrix-id {/,/}/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
+    sed -i "/location \/turn {/,/}/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
     systemctl restart nginx
 
     remove_completion_param install_matrix