diff --git a/src/components/pages/FaxSettings/CscFaxToMailSettings.vue b/src/components/pages/FaxSettings/CscFaxToMailSettings.vue
index 608a9795..1f1b4f09 100644
--- a/src/components/pages/FaxSettings/CscFaxToMailSettings.vue
+++ b/src/components/pages/FaxSettings/CscFaxToMailSettings.vue
@@ -163,6 +163,10 @@ export default {
         id: {
             type: String,
             default: ''
+        },
+        isPbxConfigurationContext: {
+            type: Boolean,
+            default: false
         }
     },
     data () {
@@ -212,7 +216,7 @@ export default {
         },
         async setChangedData (field, value) {
             try {
-                await this.faxServerSettingsUpdateAction({ field, value, id: this.id })
+                await this.faxServerSettingsUpdateAction({ field, value, id: this.id, fromPbxConfiguration: this.isPbxConfigurationContext })
                 this.updateDataFromStore()
             } catch (err) {
                 showGlobalError(err?.message)
diff --git a/src/pages/CscPagePbxGroupDetails.vue b/src/pages/CscPagePbxGroupDetails.vue
index 568db92c..7cc8c765 100644
--- a/src/pages/CscPagePbxGroupDetails.vue
+++ b/src/pages/CscPagePbxGroupDetails.vue
@@ -275,6 +275,7 @@
             v-if="selectedTab === 'fax2mail'"
             :id="id"
             :key="id"
+            :is-pbx-configuration-context="true"
         />
         <csc-mail-to-fax-settings
             v-if="selectedTab === 'mail2fax'"
diff --git a/src/pages/CscPagePbxSeatDetails.vue b/src/pages/CscPagePbxSeatDetails.vue
index 7ab103cf..7049c093 100644
--- a/src/pages/CscPagePbxSeatDetails.vue
+++ b/src/pages/CscPagePbxSeatDetails.vue
@@ -358,6 +358,7 @@
             v-if="selectedTab === 'fax2mail'"
             :id="id"
             :key="id"
+            :is-pbx-configuration-context="true"
         />
         <csc-mail-to-fax-settings
             v-if="selectedTab === 'mail2fax'"
diff --git a/src/store/fax.js b/src/store/fax.js
index 3f4cb630..1fd73e41 100644
--- a/src/store/fax.js
+++ b/src/store/fax.js
@@ -51,7 +51,9 @@ export default {
             context.commit('settingsSucceeded', {
                 faxServerSettings
             })
-            context.commit('user/updateFaxActiveCapabilityState', faxServerSettings.active, { root: true })
+            if (!options.fromPbxConfiguration) {
+                context.commit('user/updateFaxActiveCapabilityState', faxServerSettings.active, { root: true })
+            }
         },
 
         async loadMailToFaxSettingsAction (context, id) {