diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index d6fd57a5..6318d94a 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -643,7 +643,11 @@ function install_home_server {
         exit 783724
     fi
 
+    # Disable the web client
     sed -i 's|web_client:.*|web_client: False|g' $MATRIX_DATA_DIR/homeserver.yaml
+    if ! grep "#- webclient" $MATRIX_DATA_DIR/homeserver.yaml; then
+        sed -i 's|- webclient.*|#- webclient|g' $MATRIX_DATA_DIR/homeserver.yaml
+    fi
 
     chmod -R 700 $MATRIX_DATA_DIR/homeserver.yaml
     chown -R matrix:matrix /etc/matrix