diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 9db2cad0..c7247a83 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -48,10 +48,10 @@ matrix_variables=(ONION_ONLY
                   DEFAULT_DOMAIN_NAME)
 
 function matrix_nginx {
-    matrix_proxy_str='
-    location /matrix {
-        proxy_pass https://localhost:8448;
-        proxy_buffering on;
+    matrix_proxy_str=' \
+    location /matrix { \
+        proxy_pass https://localhost:8448; \
+        proxy_buffering on; \
     }'
 
     if [ ! -f /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} ]; then
@@ -364,6 +364,9 @@ function remove_matrix {
     delgroup matrix
     remove_onion_service matrix ${MATRIX_PORT}
 
+    sed -i "/location \/matrix {/,/}/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
+    systemctl restart nginx
+
     remove_completion_param install_matrix
     sed -i '/matrix/d' $COMPLETION_FILE
 }