diff --git a/src/components/call-forwarding/CscCfGroupTitle.vue b/src/components/call-forwarding/CscCfGroupTitle.vue
index c31e4f02..0d0834ad 100644
--- a/src/components/call-forwarding/CscCfGroupTitle.vue
+++ b/src/components/call-forwarding/CscCfGroupTitle.vue
@@ -10,6 +10,7 @@
             >
                 <q-toggle
                     :model-value="mapping.enabled"
+                    :disable="loading || $wait.is(waitIdentifier)"
                     data-cy="csc-forwarding-toggle"
                     @update:model-value="toggleMappingEvent(mapping)"
                 />
diff --git a/src/store/call-forwarding/actions.js b/src/store/call-forwarding/actions.js
index 566942ae..f247f1ac 100644
--- a/src/store/call-forwarding/actions.js
+++ b/src/store/call-forwarding/actions.js
@@ -13,6 +13,7 @@ import {
     cfLoadAnnouncements,
     cfLoadBNumberSets,
     cfLoadDestinationSets,
+    cfLoadMappings,
     cfLoadMappingsFull,
     cfLoadSourceSets,
     cfLoadTimeSets,
@@ -157,13 +158,15 @@ export async function setMappingEnabled ({ dispatch, commit, state, rootGetters
             enabled: !mappingsByType[payload.index].enabled
         }
 
-        const updatedMappings = await cfUpdateMappingField({
+        await cfUpdateMappingField({
             resource: 'cfmappings',
             resourceId,
             fieldPath: payload.type,
             value: mappingsByType
         })
 
+        const updatedMappings = await cfLoadMappings(resourceId)
+
         commit('dataSucceeded', { mappings: updatedMappings })
     } catch (e) {
         showGlobalError(e.message)