diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 00bd408261..9deb8cdb22 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -8,12 +8,13 @@
 -->
 
 ## 12.x.x-cp-2.3.0 (unreleased)
-이 버전부터는 기존 버전과 연결되지 않고, 새로 포크되어 작업되고 있습니다.
+이 버전부터는 기존 버전과 연결되지 않고, 새로 포크되어 작업되고 있습니다. 따라서 기존 버전에 있던 기능들이 다시 명시될 수 있습니다.
 
 ### Improvements
-- 클라이언트: Google Translate 서비스 추가 (thanks lapy)
+- 클라이언트: Google Translate 서비스 추가 (thanks @ltlapy)
 - 클라이언트: DeepL과 Google Translate를 선택할 수 있는 옵션 추가
 - 클라이언트: Enter 키를 눌러 보내기 옵션 추가
+- 클라이언트: 서버와 연결이 끊어졌을 때 경고를 표시하지 않는 옵션 추가
 
 ## 12.x.x-cp-2.x.x (unreleased)_legacy
 
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 1133cf6901..35111d9804 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1056,6 +1056,7 @@ _serverDisconnectedBehavior:
   reload: "Automatically reload"
   dialog: "Show warning dialog"
   quiet: "Show unobtrusive warning"
+  none: "No warning"
 _channel:
   create: "Create channel"
   edit: "Edit channel"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1a256ef4c7..681dac1c8d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1073,6 +1073,7 @@ _serverDisconnectedBehavior:
   reload: "自動でリロード"
   dialog: "ダイアログで警告"
   quiet: "控えめに警告"
+  none: "警告なし"
 
 _channel:
   create: "チャンネルを作成"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 7b5429fa0a..173cb8a272 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1047,6 +1047,7 @@ _serverDisconnectedBehavior:
   reload: "자동으로 새로고침"
   dialog: "경고창 표시"
   quiet: "조용히 경고"
+  none: "알리지 않음"
 _channel:
   create: "채널 생성"
   edit: "채널 편집"
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 475456c9eb..807dc71607 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -317,7 +317,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 			if (!canceled) {
 				location.reload();
 			}
-		}
+		} else if (defaultStore.state.serverDisconnectedBehavior === 'none') {}
 	});
 
 	stream.on('emojiAdded', emojiData => {
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 4e04c8be81..c3e326fc32 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -38,6 +38,7 @@
 			<option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
 			<option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
 			<option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
+			<option value="none">{{ i18n.ts._serverDisconnectedBehavior.none }}</option>
 		</FormSelect>
 	</FormSection>
 
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 2b668b84f2..617c256e15 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -121,7 +121,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	serverDisconnectedBehavior: {
 		where: 'device',
-		default: 'quiet' as 'quiet' | 'reload' | 'dialog',
+		default: 'quiet' as 'quiet' | 'reload' | 'dialog' | 'none',
 	},
 	nsfw: {
 		where: 'device',