diff --git a/src/client/scripts/idb-proxy.ts b/src/client/scripts/idb-proxy.ts
index e15be7cde2..afbbe20795 100644
--- a/src/client/scripts/idb-proxy.ts
+++ b/src/client/scripts/idb-proxy.ts
@@ -4,21 +4,33 @@ import {
 	get as iget,
 	set as iset,
 	del as idel,
+	createStore
 } from 'idb-keyval';
 
 const fallbackName = (key: string) => `idbfallback::${key}`;
 
 let idbAvailable = typeof window !== 'undefined' ? !!window.indexedDB : true;
 
+console.log(window.indexedDB);
+console.log(idbAvailable);
+
 if (idbAvailable) {
 	try {
 		const request = indexedDB.open('keyval-store');
-		if (request.error) idbAvailable = false;
+
+		await new Promise((res, rej) => {
+			request.onerror = (e) => rej(e);
+			request.onsuccess = (e) => res(e);
+		});
 	} catch (e) {
+		console.log('catch', e)
 		idbAvailable = false;
 	}
 }
 
+console.log(idbAvailable);
+if (!idbAvailable) console.error('indexedDB is unavailable. It will use localStorage.');
+
 export async function get(key: string) {
 	if (idbAvailable) return iget(key);
 	return JSON.parse(localStorage.getItem(fallbackName(key)));
diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue
index ad1c369049..bd0c770366 100644
--- a/src/client/ui/_common_/sidebar.vue
+++ b/src/client/ui/_common_/sidebar.vue
@@ -135,7 +135,7 @@ export default defineComponent({
 		},
 
 		async openAccountMenu(ev) {
-			const storedAccounts = (await getAccounts()).filter(x => x.id !== this.$i.id);
+			const storedAccounts = await getAccounts().then(accounts => accounts.filter(x => x.id !== this.$i.id));
 			const accountsPromise = os.api('users/show', { userIds: storedAccounts.map(x => x.id) });
 
 			const accountItemPromises = storedAccounts.map(a => new Promise(res => {
diff --git a/src/client/ui/default.header.vue b/src/client/ui/default.header.vue
index a67883020f..1a358decb2 100644
--- a/src/client/ui/default.header.vue
+++ b/src/client/ui/default.header.vue
@@ -101,7 +101,7 @@ export default defineComponent({
 		},
 
 		async openAccountMenu(ev) {
-			const storedAccounts = getAccounts().filter(x => x.id !== this.$i.id);
+			const storedAccounts = await getAccounts().then(accounts => accounts.filter(x => x.id !== this.$i.id));
 			const accountsPromise = os.api('users/show', { userIds: storedAccounts.map(x => x.id) });
 
 			const accountItemPromises = storedAccounts.map(a => new Promise(res => {
@@ -161,8 +161,8 @@ export default defineComponent({
 			}, 'closed');
 		},
 
-		switchAccount(account: any) {
-			const storedAccounts = getAccounts();
+		async switchAccount(account: any) {
+			const storedAccounts = await getAccounts();
 			const token = storedAccounts.find(x => x.id === account.id).token;
 			this.switchAccountWithToken(token);
 		},
diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue
index c0c19edc1a..445103b7f4 100644
--- a/src/client/ui/default.sidebar.vue
+++ b/src/client/ui/default.sidebar.vue
@@ -121,7 +121,7 @@ export default defineComponent({
 		},
 
 		async openAccountMenu(ev) {
-			const storedAccounts = (await getAccounts()).filter(x => x.id !== this.$i.id);
+			const storedAccounts = await getAccounts().then(accounts => accounts.filter(x => x.id !== this.$i.id));
 			const accountsPromise = os.api('users/show', { userIds: storedAccounts.map(x => x.id) });
 
 			const accountItemPromises = storedAccounts.map(a => new Promise(res => {