diff --git a/src/components/ConversationSettings/LockingSettings.vue b/src/components/ConversationSettings/LockingSettings.vue
index 758c4a7e99c..8ea4456f38f 100644
--- a/src/components/ConversationSettings/LockingSettings.vue
+++ b/src/components/ConversationSettings/LockingSettings.vue
@@ -31,20 +31,28 @@
 				class="checkbox"
 				name="moderation_settings_lock_conversation_checkbox"
 				:checked="isReadOnly"
-				:disabled="isReadOnlyStateLoading"
+				:disabled="isReadOnlyStateLoading || isInCall"
 				@change="toggleReadOnly">
 			<label for="moderation_settings_lock_conversation_checkbox">{{ t('spreed', 'Lock conversation') }}</label>
+			<span v-if="isInCall">{{ t('spreed', 'You cannot lock a conversation while in a call!') }}</span>
 		</div>
 	</div>
 </template>
 
 <script>
 import { showError, showSuccess } from '@nextcloud/dialogs'
+import isInCall from '../../mixins/isInCall'
+import participant from '../../mixins/participant'
 import { CONVERSATION } from '../../constants'
 
 export default {
 	name: 'LockingSettings',
 
+	mixins: [
+		isInCall,
+		participant,
+	],
+
 	props: {
 		token: {
 			type: String,
diff --git a/src/components/ConversationSettings/SipSettings.vue b/src/components/ConversationSettings/SipSettings.vue
index 0cfca4c6d3b..1c5c83a5950 100644
--- a/src/components/ConversationSettings/SipSettings.vue
+++ b/src/components/ConversationSettings/SipSettings.vue
@@ -25,13 +25,13 @@
 			{{ t('spreed', 'Allow participants to join from a phone.') }}
 		</div>
 		<input id="sip_settings_checkbox"
+			v-model="hasSipEnabled"
 			aria-describedby="sip_settings_hint"
 			type="checkbox"
 			class="checkbox"
 			name="sip_settings_checkbox"
-			:checked="hasSIPEnabled"
 			:disabled="isSipLoading"
-			@change="toggleSIPEnabled">
+			@change="toggleSipEnabled">
 		<label for="sip_settings_checkbox">{{ t('spreed', 'Enable SIP dial-in') }}</label>
 	</div>
 </template>
@@ -46,6 +46,7 @@ export default {
 	data() {
 		return {
 			isSipLoading: false,
+			newSipEnabled: null,
 		}
 	},
 
@@ -58,13 +59,22 @@ export default {
 			return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
 		},
 
-		hasSIPEnabled() {
-			return this.conversation.sipEnabled === WEBINAR.SIP.ENABLED
+		hasSipEnabled: {
+			get() {
+				if (this.newSipEnabled !== null) {
+					return this.newSipEnabled
+				}
+				return this.conversation.sipEnabled === WEBINAR.SIP.ENABLED
+			},
+			set(value) {
+				this.newSipEnabled = value
+			},
 		},
 	},
 
 	methods: {
-		async toggleSIPEnabled() {
+		async toggleSipEnabled(checked) {
+			this.isSipLoading = true
 			try {
 				await this.$store.dispatch('setSIPEnabled', {
 					token: this.token,
@@ -76,6 +86,8 @@ export default {
 					showSuccess(t('spreed', 'SIP dial-in is now disabled'))
 				}
 			} catch (e) {
+				// revert checkbox state
+				this.newSipEnabled = !checked
 				// TODO check "precondition failed"
 				if (!this.conversation.sipEnabled) {
 					console.error('Error occurred when enabling SIP dial-in', e)
@@ -85,6 +97,7 @@ export default {
 					showError(t('spreed', 'Error occurred when disabling SIP dial-in'))
 				}
 			}
+			this.isSipLoading = false
 		},
 	},
 }