diff --git a/src/libs/util.ts b/src/libs/util.ts
index 0af2bb47..5b7ce91e 100644
--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -32,11 +32,17 @@ import {
 import * as serverUtil from "../libs/endorserServer";
 import {
   containsHiddenDid,
+} from "../libs/endorserServer";
+import {
   GenericCredWrapper,
   GenericVerifiableCredential,
+} from "../interfaces/common";
+import {
   GiveSummaryRecord,
+} from "../interfaces/records";
+import {
   OfferVerifiableCredential,
-} from "../libs/endorserServer";
+} from "../interfaces/claims";
 import { KeyMeta } from "../libs/crypto/vc";
 import { createPeerDid } from "../libs/crypto/vc/didPeer";
 import { registerCredential } from "../libs/crypto/vc/passkeyDidPeer";
@@ -474,12 +480,14 @@ export function findAllVisibleToDids(
 export interface AccountKeyInfo extends Account, KeyMeta {}
 
 export const retrieveAccountCount = async (): Promise<number> => {
-  let result;
+  let result = 0;
   const platformService = PlatformServiceFactory.getInstance();
   const dbResult = await platformService.dbQuery(
     `SELECT COUNT(*) FROM accounts`,
   );
-  result = dbResult.values[0][0] as number;
+  if (dbResult?.values?.[0]?.[0]) {
+    result = dbResult.values[0][0] as number;
+  }
 
   if (USE_DEXIE_DB) {
     // one of the few times we use accountsDBPromise directly; try to avoid more usage