diff --git a/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php b/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
index 4e46cf9f81..be3b5e78e7 100644
--- a/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
+++ b/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
@@ -36,19 +36,36 @@ class Orphan implements Filter
 {
     public function apply(SelectBuilder $queryBuilder): void
     {
-        $queryBuilder->where([
-            'entityEmailAddress.id' => null,
-        ]);
-
-        $queryBuilder->leftJoin(
-            'EntityEmailAddress',
-            'entityEmailAddress',
-            [
-                'emailAddressId:' => 'id',
-                'deleted' => false,
-            ]
-        );
-
-        $queryBuilder->distinct();
+        $queryBuilder
+            ->distinct()
+            ->leftJoin(
+                'EntityEmailAddress',
+                'entityEmailAddress',
+                [
+                    'emailAddressId:' => 'id',
+                    'deleted' => false,
+                ]
+            )
+            ->leftJoin(
+                'EmailEmailAddress',
+                'emailEmailAddress',
+                [
+                    'emailAddressId:' => 'id',
+                    'deleted' => false,
+                ]
+            )
+            ->leftJoin(
+                'Email',
+                'email',
+                [
+                    'fromEmailAddressId:' => 'id',
+                    'deleted' => false,
+                ]
+            )
+            ->where([
+                'entityEmailAddress.id' => null,
+                'emailEmailAddress.id' => null,
+                'email.id' => null,
+            ]);
     }
 }