diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index bfc350aad..ebe33a927 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -14,6 +14,7 @@ import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useUsersStore } from 'src/stores/users.js'
+import { useStreamingStore } from 'src/stores/streaming.js'
 
 import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
@@ -70,6 +71,13 @@ const GeneralTab = {
     updateFont(path, value) {
       useLocalConfigStore().set({ path, value })
     },
+    toggleStreaming(value) {
+      if (value) {
+        useStreamingStore().initSocket()
+      } else {
+        useStreamingStore().stopSocket()
+      }
+    },
   },
 }
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 9ccde0b2c..208777fda 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -129,6 +129,7 @@
             path="useStreamingApi"
             :local="true"
             expert="1"
+            @update:model-value="toggleStreaming"
           >
             {{ $t('settings.useStreamingApi') }}
           </BooleanSetting>