diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
index 846f79e817..feaadebd2e 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
@@ -193,15 +193,25 @@
                 ]
             },
             "where": {
-                "=": {
-                    "leftJoins": ["accounts"],
-                    "sql": "accountsMiddle.is_inactive = {value}",
-                    "distinct": true
+                "= TRUE": {
+                    "leftJoins": [
+                        [
+                            "AccountContact",
+                            "accountContactFilterIsInactive",
+                            {"contact.accountId:": "accountContactFilterIsInactive.accountId"}
+                        ]
+                    ],
+                    "sql": "accountContactFilterIsInactive.is_inactive = true"
                 },
-                "<>": {
-                    "leftJoins": ["accounts"],
-                    "sql": "accountsMiddle.is_inactive <> {value}",
-                    "distinct": true
+                "= FALSE": {
+                    "leftJoins": [
+                        [
+                            "AccountContact",
+                            "accountContactFilterIsInactive",
+                            {"contact.accountId:": "accountContactFilterIsInactive.accountId"}
+                        ]
+                    ],
+                    "sql": "accountContactFilterIsInactive.is_inactive <> true OR accountContactFilterIsInactive.is_inactive IS NULL"
                 }
             },
             "layoutListDisabled": true,