diff --git a/api/src/feat/policies/existing-policies.edgeql b/api/src/feat/policies/existing-policies.edgeql
index afb279a4b..aae17324d 100644
--- a/api/src/feat/policies/existing-policies.edgeql
+++ b/api/src/feat/policies/existing-policies.edgeql
@@ -1,6 +1,6 @@
 with account := (select Account filter .address = <UAddress>$account),
      keys := array_unpack(<array<uint16>>$policyKeys)
-select Policy {
+select account.<account[is Policy] {
   key,
   name,
   approvers: { address },
@@ -26,5 +26,4 @@ select Policy {
   },
   allowMessages,
   delay,
-} filter .account = account and .key in keys and 
-  (.isDraft if exists .draft else .isLatest) 
\ No newline at end of file
+} filter .key in keys and (.isDraft if exists .draft else .isLatest) 
\ No newline at end of file
diff --git a/api/src/feat/policies/existing-policies.query.ts b/api/src/feat/policies/existing-policies.query.ts
index 918ef3abd..669b37793 100644
--- a/api/src/feat/policies/existing-policies.query.ts
+++ b/api/src/feat/policies/existing-policies.query.ts
@@ -45,7 +45,7 @@ export function existingPolicies(client: Executor, args: ExistingPoliciesArgs):
   return client.query(`\
 with account := (select Account filter .address = <UAddress>$account),
      keys := array_unpack(<array<uint16>>$policyKeys)
-select Policy {
+select account.<account[is Policy] {
   key,
   name,
   approvers: { address },
@@ -71,7 +71,6 @@ select Policy {
   },
   allowMessages,
   delay,
-} filter .account = account and .key in keys and 
-  (.isDraft if exists .draft else .isLatest)`, args);
+} filter .key in keys and (.isDraft if exists .draft else .isLatest)`, args);
 
 }