diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 2171abb60f..e712de1f84 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -36,7 +36,8 @@ type PizzaxChannelMessage<T extends StateDef> = {
 	userId?: string;
 };
 
-class Store<T extends StateDef> extends Pizzax<State<T>> {
+// TODO: export消す
+export class Store<T extends StateDef> extends Pizzax<State<T>> {
 	public readonly def: T;
 
 	public readonly ready: Promise<void>;
@@ -60,7 +61,7 @@ class Store<T extends StateDef> extends Pizzax<State<T>> {
 		return promise;
 	}
 
-	constructor(def: T) {
+	constructor(def: T, key = 'base') {
 		const data = {} as State<T>;
 
 		for (const [k, v] of Object.entries(def) as [keyof T, T[keyof T]['default']][]) {
@@ -69,7 +70,6 @@ class Store<T extends StateDef> extends Pizzax<State<T>> {
 
 		super(data);
 
-		const key = 'base';
 		this.key = key;
 		this.deviceStateKeyName = `pizzax::${key}`;
 		this.deviceAccountStateKeyName = $i ? `pizzax::${key}::${$i.id}` : '';
diff --git a/packages/frontend/src/ui/deck/deck-store.ts b/packages/frontend/src/ui/deck/deck-store.ts
index bdca513a7a..cc648a4d90 100644
--- a/packages/frontend/src/ui/deck/deck-store.ts
+++ b/packages/frontend/src/ui/deck/deck-store.ts
@@ -5,10 +5,10 @@
 
 import { markRaw } from 'vue';
 import type { Column } from '@/deck.js';
-import { Storage } from '@/pizzax.js';
+import { Store } from '@/store.js';
 
 // TODO: 消す(移行済みのため)
-export const deckStore = markRaw(new Storage('deck', {
+export const deckStore = markRaw(new Store({
 	profile: {
 		where: 'deviceAccount',
 		default: 'default',
@@ -21,4 +21,4 @@ export const deckStore = markRaw(new Storage('deck', {
 		where: 'deviceAccount',
 		default: [] as Column['id'][][],
 	},
-}));
+}, 'deck'));