diff --git a/src/Handler/DeleteHandler.php b/src/Handler/DeleteHandler.php
index 1cf6cc9d..86f90a9f 100644
--- a/src/Handler/DeleteHandler.php
+++ b/src/Handler/DeleteHandler.php
@@ -13,8 +13,11 @@ class DeleteHandler
     /**
      * DeleteHandler constructor.
      */
-    public function __construct(private readonly PasswordUpdater $passwordUpdater, private readonly EntityManagerInterface $manager, private readonly WkdHandler $wkdHandler)
-    {
+    public function __construct(
+        private readonly PasswordUpdater $passwordUpdater,
+        private readonly EntityManagerInterface $manager,
+        private readonly WkdHandler $wkdHandler
+    ) {
     }
 
     public function deleteAlias(Alias $alias, User $user = null)
@@ -52,12 +55,14 @@ public function deleteUser(User $user)
         $user->eraseMailCryptPublicKey();
         $user->eraseMailCryptSecretBox();
 
-        // Delete OpenPGP key from WKD
-        $this->wkdHandler->deleteKey($user->getEmail());
-
         // Flag user as deleted
         $user->setDeleted(true);
 
+        // Delete OpenPGP key from WKD if no other user owns mail handle
+        if (!$this->wkdHandler->userToUserIdExists($user->getEmail())) {
+            $this->wkdHandler->deleteKey($user->getEmail());
+        }
+
         $this->manager->flush();
     }
 }
diff --git a/src/Handler/WkdHandler.php b/src/Handler/WkdHandler.php
index 1c9f4b04..7abd2010 100644
--- a/src/Handler/WkdHandler.php
+++ b/src/Handler/WkdHandler.php
@@ -154,7 +154,8 @@ public function userToUserIdExists(string $uid): bool
         if ($this->manager->getRepository(Alias::class)->findOneBySource($uid, false)) {
             return true;
         }
-        if ($this->manager->getRepository(User::class)->findOneBy($uid, false)) {
+
+        if ($this->manager->getRepository(User::class)->findByEmail($uid, false)) {
             return true;
         }
         return false;