diff --git a/src/components/AdminSettings/GeneralSettings.vue b/src/components/AdminSettings/GeneralSettings.vue
index 53332fbfbb3d..1cbd37e28fa9 100644
--- a/src/components/AdminSettings/GeneralSettings.vue
+++ b/src/components/AdminSettings/GeneralSettings.vue
@@ -101,7 +101,7 @@ export default {
 			hasFeatureJoinFeatures: false,
 			hasSignalingServers: false,
 			isE2EECallsEnabled: false,
-			hasSIPBridge: false, // FIXME Based on loadState('spreed', 'sip_bridge_shared_secret') but should update with live data?
+			hasSIPBridge: !!loadState('spreed', 'sip_bridge_shared_secret'),
 		}
 	},
 
@@ -126,11 +126,13 @@ export default {
 		this.updateSignalingServers(signaling.servers)
 		EventBus.on('signaling-servers-updated', this.updateSignalingServers)
 		EventBus.on('signaling-server-connected', this.updateSignalingDetails)
+		EventBus.on('sip-settings-updated', this.updateSipDetails)
 	},
 
 	beforeDestroy() {
 		EventBus.off('signaling-servers-updated', this.updateSignalingServers)
 		EventBus.off('signaling-server-connected', this.updateSignalingDetails)
+		EventBus.off('sip-settings-updated', this.updateSipDetails)
 	},
 
 	methods: {
@@ -144,6 +146,10 @@ export default {
 			this.hasFeatureJoinFeatures = signaling.hasFeature('join-features')
 		},
 
+		updateSipDetails(settings) {
+			this.hasSIPBridge = !!settings.sharedSecret
+		},
+
 		updateE2EECallsEnabled(value) {
 			this.loading = true
 			OCP.AppConfig.setValue('spreed', 'call_end_to_end_encryption', value ? '1' : '0', {
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index 70c7be5460f9..39f4455cf826 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -188,6 +188,7 @@ export default {
 				dialOutEnabled: this.dialOutEnabled,
 				sipGroups: this.sipGroups.map(group => group.id).join('_')
 			}
+			EventBus.emit('sip-settings-updated', this.currentSetup)
 		},
 
 		async saveSIPSettings() {