diff --git a/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap b/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap
index f7291140298..3332307cb71 100644
--- a/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap
+++ b/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`initialState 1`] = `
 {
@@ -23,6 +23,7 @@ exports[`initialState 1`] = `
   "core": {
     "account": {
       "activeWalletIds": [],
+      "allKeys": [],
       "currencyConfig": {},
       "currencyWallets": {},
       "rootLoginId": "",
diff --git a/src/components/scenes/WalletListScene.tsx b/src/components/scenes/WalletListScene.tsx
index be08e64743f..6ddc240d6b9 100644
--- a/src/components/scenes/WalletListScene.tsx
+++ b/src/components/scenes/WalletListScene.tsx
@@ -41,7 +41,7 @@ export function WalletListScene(props: Props) {
 
   const account = useSelector(state => state.core.account)
   const currencyWallets = useWatch(account, 'currencyWallets')
-  const allKeys = useWatch(account, 'allKeys')
+  const allKeys = useWatch(account, 'allKeys') ?? []
   const hasRestoreWallets =
     allKeys.filter(key => key.archived || key.deleted).length > 0
 
diff --git a/src/reducers/CoreReducer.ts b/src/reducers/CoreReducer.ts
index f9858bf9108..2cd396dd02e 100644
--- a/src/reducers/CoreReducer.ts
+++ b/src/reducers/CoreReducer.ts
@@ -18,6 +18,7 @@ const defaultContext: EdgeContext = flowHack
 const defaultDisklet: Disklet = flowHack
 
 const accountHack: any = {
+  allKeys: [],
   activeWalletIds: [],
   currencyConfig: {},
   currencyWallets: {},