diff --git a/src/stores/mainVehicle.ts b/src/stores/mainVehicle.ts
index c0f061f24..cf8b72b43 100644
--- a/src/stores/mainVehicle.ts
+++ b/src/stores/mainVehicle.ts
@@ -75,7 +75,10 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     data: defaultWebRTCSignallingURI.value,
     enabled: false,
   } as CustomParameter<string>)
-  const customWebRTCConfiguration = useStorage('cockpit-rtc-config', defaultRtcConfiguration)
+  const customWebRTCConfiguration = useStorage('cockpit-custom-rtc-config', {
+    data: defaultRtcConfiguration,
+    enabled: false,
+  })
 
   const lastHeartbeat = ref<Date>()
   const firmwareType = ref<MavAutopilot>()
@@ -133,7 +136,7 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
       }
     }
     console.log('Using WebRTC configuration from storage.')
-    return customWebRTCConfiguration.value
+    return customWebRTCConfiguration.value.enabled ? customWebRTCConfiguration.value.data : defaultRtcConfiguration
   })
 
   /**
diff --git a/src/views/ConfigurationGeneralView.vue b/src/views/ConfigurationGeneralView.vue
index b548de7d4..bb2a32880 100644
--- a/src/views/ConfigurationGeneralView.vue
+++ b/src/views/ConfigurationGeneralView.vue
@@ -137,13 +137,21 @@
           />
         </v-form>
         <span>Current address: {{ mainVehicleStore.webRTCSignallingURI.toString() }} </span><br />
-        <div class="my-4 ml-2">
+        <div class="my-4">
           <span class="text-lg">Custom RTC configuration:</span>
-          <div class="mx-2">
+          <div class="mt-2">
             <div class="flex">
+              <v-checkbox
+                v-model="mainVehicleStore.customWebRTCConfiguration.enabled"
+                v-tooltip.bottom="'Enable custom'"
+                class="mx-1 mb-5 pa-0"
+                rounded="lg"
+                hide-details
+              />
               <v-textarea
                 id="rtcConfigTextInput"
                 v-model="customRtcConfiguration"
+                :disabled="!mainVehicleStore.customWebRTCConfiguration.enabled"
                 variant="underlined"
                 label="Custom WebRTC Configuration"
                 clearable
@@ -348,11 +356,11 @@ const isValidSocketConnectionURI = (value: string): boolean | string => {
   return true
 }
 
-const customRtcConfiguration = ref<string>(JSON.stringify(mainVehicleStore.customWebRTCConfiguration, null, 4))
+const customRtcConfiguration = ref<string>(JSON.stringify(mainVehicleStore.customWebRTCConfiguration.data, null, 4))
 const updateWebRtcConfiguration = (): void => {
   try {
     const newConfig = JSON.parse(customRtcConfiguration.value)
-    mainVehicleStore.customWebRTCConfiguration = newConfig
+    mainVehicleStore.customWebRTCConfiguration.data = newConfig
     location.reload()
   } catch (error) {
     alert(`Could not update WebRTC configuration. ${error}.`)