diff --git a/stores/account-security-store.ts b/stores/account-security-store.ts
index ddac60c8f..66d83353c 100644
--- a/stores/account-security-store.ts
+++ b/stores/account-security-store.ts
@@ -627,7 +627,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
     try {
       const accountId = getPrimaryAccountId();
       const queryResponses = await stalwartJmap([
-        ['x:PublicKey/query', { filter: { accountId } }, '0'],
+        ['x:PublicKey/query', { accountId }, '0'],
       ]);
 
       const queryResult = requireResult<{ ids: string[] }>(queryResponses, 'x:PublicKey/query');
@@ -740,6 +740,8 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
     otpEnabled: false,
     appPasswords: [],
     apiKeys: [],
+    publicKeys: [],
+    isLoadingPublicKeys: false,
     isLoadingAuth: false,
     encryptionConfig: {
       type: 'Disabled',