diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh
index 4b67cd58..96497efc 100644
--- a/apps/tmbitwarden.sh
+++ b/apps/tmbitwarden.sh
@@ -146,6 +146,7 @@ if grep ^url "$BITWARDEN_HOME"/bwdata/config.yml | grep -q https || grep ^url "$
 then
     msg_box "It seems like some of the settings you entered are wrong. We will now remove Bitwarden so that you can start over with the installation."
     check_command systemctl stop bitwarden
+    docker volume prune -f
     docker system prune -af
     rm -rf "${BITWARDEN_HOME:?}/"bwdata
     exit 1
@@ -268,7 +269,9 @@ else
     # remove settings to be able to start over again
     rm -f "$HTTPS_CONF"
     last_fail_tls "$SCRIPTS"/apps/tmbitwarden.sh
-    systemctl stop bitwarden && docker system prune -af
+    systemctl stop bitwarden
+    docker volume prune -f
+    docker system prune -af
     rm -rf "${BITWARDEN_HOME:?}/"bwdata
     exit 1
 fi