diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 66d75e70fb..899bf1f107 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -40,9 +40,12 @@ import { reloadChannel } from '@/scripts/unison-reload';
 import { reactionPicker } from '@/scripts/reaction-picker';
 import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
+import { deckStore } from './ui/deck/deck-store';
 
 console.info(`Misskey v${version}`);
 
+await defaultStore.ready;
+
 if (_DEV_) {
 	console.warn('Development mode!!!');
 
@@ -219,6 +222,9 @@ if (splash) splash.addEventListener('transitionend', () => {
 
 const rootEl = document.createElement('div');
 document.body.appendChild(rootEl);
+
+if (ui === 'deck') await deckStore.ready;
+
 app.mount(rootEl);
 
 // boot.jsのやつを解除
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index e1718d3df9..73dc83180f 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -68,7 +68,7 @@ export default defineComponent({
 		DeckColumnCore,
 	},
 
-	async setup() {
+	setup() {
 		const isMobile = ref(window.innerWidth <= 500);
 		window.addEventListener('resize', () => {
 			isMobile.value = window.innerWidth <= 500;
@@ -81,8 +81,6 @@ export default defineComponent({
 			drawerMenuShowing.value = false;
 		});
 
-		await deckStore.ready;
-
 		const columns = deckStore.reactiveState.columns;
 		const layout = deckStore.reactiveState.layout;
 		const menuIndicated = computed(() => {