diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e0957befa5..1e0ccaeebc 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -348,6 +348,7 @@ resetPassword: "パスワードをリセット"
 newPasswordIs: "新しいパスワードは「{password}」です"
 post: "投稿"
 posted: "投稿しました"
+autoReloadWhenDisconnected: "サーバー切断時に自動リロード"
 
 _2fa:
   registerDevice: "デバイスを登録"
diff --git a/src/client/app.vue b/src/client/app.vue
index 847a9827e0..d1bc610f73 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -222,6 +222,10 @@ export default Vue.extend({
 
 		this.$root.stream.on('_disconnected_', () => {
 			if (!this.disconnectedDialog) {
+				if (this.$store.state.device.autoReload) {
+					location.reload();
+					return;
+				}
 				this.disconnectedDialog = this.$root.dialog({
 					type: 'warning',
 					showCancelButton: true,
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index f5c2f4ceeb..5b04077f3c 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -10,6 +10,9 @@
 		<mk-button primary :disabled="$store.state.settings.wallpaper == null" @click="delWallpaper()">{{ $t('removeWallpaper') }}</mk-button>
 	</div>
 	<div class="_content">
+		<mk-switch v-model="autoReload">
+			{{ $t('autoReloadWhenDisconnected') }}
+		</mk-switch>
 		<mk-switch v-model="$store.state.i.autoWatch" @change="onChangeAutoWatch">
 			{{ $t('auto-watch') }}<template #desc>{{ $t('auto-watch-desc') }}</template>
 		</mk-switch>
@@ -52,6 +55,11 @@ export default Vue.extend({
 			get() { return this.$store.state.settings.wallpaper; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'wallpaper', value }); }
 		},
+
+		autoReload: {
+			get() { return this.$store.state.device.autoReload; },
+			set(value) { this.$store.commit('device/set', { key: 'autoReload', value }); }
+		},
 	},
 
 	methods: {
diff --git a/src/client/store.ts b/src/client/store.ts
index 73112829e1..d656d932b5 100644
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -22,6 +22,7 @@ const defaultDeviceSettings = {
 	loadRawImages: false,
 	alwaysShowNsfw: false,
 	useOsDefaultEmojis: false,
+	autoReload: false,
 	accounts: [],
 	recentEmojis: [],
 	visibility: 'public',