diff --git a/lib/private/User/Listeners/BeforeUserDeletedListener.php b/lib/private/User/Listeners/BeforeUserDeletedListener.php
index 8978c341a13f6..a19f1dda791a1 100644
--- a/lib/private/User/Listeners/BeforeUserDeletedListener.php
+++ b/lib/private/User/Listeners/BeforeUserDeletedListener.php
@@ -27,6 +27,7 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\NotFoundException;
 use OCP\IAvatarManager;
+use OCP\Security\ICredentialsManager;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use Psr\Log\LoggerInterface;
 
@@ -35,10 +36,12 @@
  */
 class BeforeUserDeletedListener implements IEventListener {
 	private IAvatarManager $avatarManager;
+	private ICredentialsManager $credentialsManager;
 	private LoggerInterface $logger;
 
-	public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager) {
+	public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
 		$this->avatarManager = $avatarManager;
+		$this->credentialsManager = $credentialsManager;
 		$this->logger = $logger;
 	}
 
@@ -61,5 +64,7 @@ public function handle(Event $event): void {
 				'exception' => $e,
 			]);
 		}
+		// Delete storages credentials on user deletion
+		$this->credentialsManager->erase($user->getUID());
 	}
 }