diff --git a/src/components/ConversationSettings/LockingSettings.vue b/src/components/ConversationSettings/LockingSettings.vue
index 528c024c167..758c4a7e99c 100644
--- a/src/components/ConversationSettings/LockingSettings.vue
+++ b/src/components/ConversationSettings/LockingSettings.vue
@@ -68,20 +68,6 @@ export default {
 		},
 	},
 
-	watch: {
-		value(value) {
-			this.listable = value
-		},
-	},
-
-	mounted() {
-		if (this.token) {
-			this.listable = this.value || this.conversation.listable
-		} else {
-			this.listable = this.value
-		}
-	},
-
 	methods: {
 		async toggleReadOnly() {
 			const newReadOnly = this.isReadOnly ? CONVERSATION.STATE.READ_WRITE : CONVERSATION.STATE.READ_ONLY
diff --git a/src/components/ConversationSettings/SipSettings.vue b/src/components/ConversationSettings/SipSettings.vue
index f8c8c14a5ad..0cfca4c6d3b 100644
--- a/src/components/ConversationSettings/SipSettings.vue
+++ b/src/components/ConversationSettings/SipSettings.vue
@@ -64,20 +64,20 @@ export default {
 	},
 
 	methods: {
-		async toggleSIPEnabled(checked) {
+		async toggleSIPEnabled() {
 			try {
 				await this.$store.dispatch('setSIPEnabled', {
 					token: this.token,
-					state: checked ? WEBINAR.SIP.ENABLED : WEBINAR.SIP.DISABLED,
+					state: !this.conversation.sipEnabled ? WEBINAR.SIP.ENABLED : WEBINAR.SIP.DISABLED,
 				})
-				if (checked) {
+				if (this.conversation.sipEnabled) {
 					showSuccess(t('spreed', 'SIP dial-in is now enabled'))
 				} else {
 					showSuccess(t('spreed', 'SIP dial-in is now disabled'))
 				}
 			} catch (e) {
 				// TODO check "precondition failed"
-				if (checked) {
+				if (!this.conversation.sipEnabled) {
 					console.error('Error occurred when enabling SIP dial-in', e)
 					showError(t('spreed', 'Error occurred when enabling SIP dial-in'))
 				} else {