diff --git a/packages/frontend/src/accounts.ts b/packages/frontend/src/accounts.ts
index 420eafdb1d..6454c1249d 100644
--- a/packages/frontend/src/accounts.ts
+++ b/packages/frontend/src/accounts.ts
@@ -55,10 +55,15 @@ export async function removeAccount(host: string, id: AccountWithToken['id']) {
 	const accountInfos = JSON.parse(JSON.stringify(store.s.accountInfos));
 	delete accountInfos[host + '/' + id];
 	store.set('accountInfos', accountInfos);
-
 	prefer.commit('accounts', prefer.s.accounts.filter(x => x[0] !== host || x[1].id !== id));
 }
 
+export async function removeAccountData(host: string, id: AccountWithToken['id']) {
+	// 設定・状態を削除
+	prefer.clearAccountSettingsFromDevice(host, id);
+	await store.clearAccountDataFromDevice(id);
+}
+
 const isAccountDeleted = Symbol('isAccountDeleted');
 
 function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Promise<Misskey.entities.MeDetailed> {
@@ -176,6 +181,7 @@ export async function refreshAccounts() {
 			} catch (e) {
 				if (e === isAccountDeleted) {
 					await removeAccount(account.host, account.id);
+					await removeAccountData(account.host, account.id);
 				}
 			}
 		}
diff --git a/packages/frontend/src/lib/pizzax.ts b/packages/frontend/src/lib/pizzax.ts
index e96af3401e..61060ab4d1 100644
--- a/packages/frontend/src/lib/pizzax.ts
+++ b/packages/frontend/src/lib/pizzax.ts
@@ -223,12 +223,15 @@ export class Pizzax<T extends StateDef> {
 	}
 
 	/** 現在のアカウントに紐づくデータをデバイスから削除します */
-	public async clearCurrentAccountDataFromDevice() {
-		if ($i == null) return;
+	public async clearAccountDataFromDevice(id = $i?.id) {
+		if (id == null) return;
+
+		const deviceAccountStateKey = `pizzax::${this.key}::${id}` satisfies typeof this.deviceAccountStateKeyName;
+		const registryCacheKey = `pizzax::${this.key}::cache::${id}` satisfies typeof this.registryCacheKeyName;
 
 		// deviceAccount
-		{
-			const deviceAccountState = await get(this.deviceAccountStateKeyName) || {};
+		const deviceAccountState = await get(deviceAccountStateKey);
+		if (deviceAccountState != null) {
 			let changed = false;
 			for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
 				if (v.where === 'deviceAccount' && Object.prototype.hasOwnProperty.call(deviceAccountState, k)) {
@@ -238,14 +241,14 @@ export class Pizzax<T extends StateDef> {
 			}
 			if (changed) {
 				await this.addIdbSetJob(async () => {
-					await set(this.deviceAccountStateKeyName, deviceAccountState);
+					await set(deviceAccountStateKey, deviceAccountState);
 				});
 			}
 		}
 
 		// account (cacheを消す)
-		{
-			const registryCache = await get(this.registryCacheKeyName) || {};
+		const registryCache = await get(registryCacheKey);
+		if (registryCache != null) {
 			let changed = false;
 			for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
 				if (v.where === 'account' && Object.prototype.hasOwnProperty.call(registryCache, k)) {
@@ -255,7 +258,7 @@ export class Pizzax<T extends StateDef> {
 			}
 			if (changed) {
 				await this.addIdbSetJob(async () => {
-					await set(this.registryCacheKeyName, registryCache);
+					await set(registryCacheKey, registryCache);
 				});
 			}
 		}
diff --git a/packages/frontend/src/pages/settings/accounts.vue b/packages/frontend/src/pages/settings/accounts.vue
index 05be5141d4..fe8a25a7ae 100644
--- a/packages/frontend/src/pages/settings/accounts.vue
+++ b/packages/frontend/src/pages/settings/accounts.vue
@@ -37,7 +37,7 @@ import type { MenuItem } from '@/types/menu.js';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import { $i } from '@/i.js';
-import { switchAccount, removeAccount, getAccountWithSigninDialog, getAccountWithSignupDialog, getAccounts, refreshAccounts } from '@/accounts.js';
+import { switchAccount, removeAccount, removeAccountData, getAccountWithSigninDialog, getAccountWithSignupDialog, getAccounts, refreshAccounts } from '@/accounts.js';
 import type { AccountData } from '@/accounts.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
@@ -93,6 +93,7 @@ function showMenu(a: AccountData, ev: MouseEvent) {
 				if (canceled) return;
 				await os.promiseDialog((async () => {
 					await removeAccount(a.host, a.id);
+					await removeAccountData(a.host, a.id);
 					accounts.value = await getAccounts();
 				})());
 			},
@@ -121,7 +122,7 @@ async function addExistingAccount() {
 }
 
 async function createAccount() {
-	const res = await getAccountWithSignupDialog()
+	const res = await getAccountWithSignupDialog();
 	if (res != null) {
 		os.success();
 	}
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index 60daa4afca..64112e0abd 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -449,10 +449,9 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> {
 		this.save();
 	}
 
-	/** 現在の操作アカウントに紐づく設定値をデバイスから削除します（ログアウト時） */
-	public clearCurrentAccountSettingsFromDevice() {
-		const currentAccount = this.currentAccount; // TSを黙らせるため
-		if (currentAccount == null) return;
+	/** 現在の操作アカウントに紐づく設定値をデバイスから削除します（ログアウト時などに使用） */
+	public clearAccountSettingsFromDevice(targetHost = host, id = this.currentAccount?.id) {
+		if (id == null) return;
 
 		let changed = false;
 
@@ -462,7 +461,7 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> {
 
 			const index = records.findIndex((record: PrefRecord<typeof key>) => {
 				const scope = parseScope(record[0]);
-				return scope.server === host && scope.account === currentAccount.id;
+				return scope.server === targetHost && scope.account === id;
 			});
 			if (index === -1) continue;
 
diff --git a/packages/frontend/src/signout.ts b/packages/frontend/src/signout.ts
index 445e266ff7..db6e22a52b 100644
--- a/packages/frontend/src/signout.ts
+++ b/packages/frontend/src/signout.ts
@@ -79,8 +79,8 @@ async function removeCurrentAccountData() {
 	if ($i == null) return;
 
 	// 設定・状態を削除
-	prefer.clearCurrentAccountSettingsFromDevice();
-	await store.clearCurrentAccountDataFromDevice();
+	prefer.clearAccountSettingsFromDevice();
+	await store.clearAccountDataFromDevice();
 }
 
 export async function signout(all = false) {