diff --git a/cypress/e2e/settings.cy.ts b/cypress/e2e/settings.cy.ts
index a8010634d..49d0777d7 100644
--- a/cypress/e2e/settings.cy.ts
+++ b/cypress/e2e/settings.cy.ts
@@ -84,27 +84,27 @@ describe('Check that user\'s settings survive a reload', () => {
 	it('Activity summary survive a reload', () => {
 		cy.intercept({ method: 'POST', url: '**/activity/settings' }).as('apiCall')
 
-		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+		cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
 			.find('input')
 			.check({ force: true })
-		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+		cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
 			.find('input')
 			.should('be.checked')
 		cy.wait('@apiCall')
 			.reload()
 
-		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+		cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
 			.scrollIntoView()
 			.find('input')
 			.should('be.checked')
 
-		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+		cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
 			.find('input')
 			.uncheck({ force: true })
 		cy.wait('@apiCall')
 			.reload()
 
-		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+		cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
 			.scrollIntoView()
 			.find('input')
 			.should('not.be.checked')
diff --git a/src/views/ActivityAppNavigation.vue b/src/views/ActivityAppNavigation.vue
index 1737e780a..6cf5881f4 100644
--- a/src/views/ActivityAppNavigation.vue
+++ b/src/views/ActivityAppNavigation.vue
@@ -23,7 +23,7 @@
 		</template>
 		<template #footer>
 			<NcAppNavigationSettings :name="t('activity', 'Activity settings')">
-				<NcCheckboxRadioSwitch type="switch" :checked="hasRSSLink" @update:checked="toggleRSSLink">
+				<NcCheckboxRadioSwitch type="switch" v-model="hasRSSLink" @update:model-value="toggleRSSLink">
 					{{ t('activity', 'Enable RSS feed') }}
 				</NcCheckboxRadioSwitch>
 				<NcInputField
diff --git a/src/views/AdminSettings.vue b/src/views/AdminSettings.vue
index 4e747ebbb..8637e54cd 100644
--- a/src/views/AdminSettings.vue
+++ b/src/views/AdminSettings.vue
@@ -7,8 +7,8 @@
 	<NcSettingsSection :name="t('activity', 'Notification')">
 		<NcCheckboxRadioSwitch
 			type="checkbox"
-			:checked="emailEnabled"
-			@update:checked="toggleEmailEnabled({ emailEnabled: $event })">
+			v-model="emailEnabled"
+			@update:model-value="toggleEmailEnabled({ emailEnabled: $event })">
 			{{ t('activity', 'Enable notification emails') }}
 		</NcCheckboxRadioSwitch>
 	</NcSettingsSection>
diff --git a/src/views/DailySummary.vue b/src/views/DailySummary.vue
index 3802869e7..7530641a7 100644
--- a/src/views/DailySummary.vue
+++ b/src/views/DailySummary.vue
@@ -7,8 +7,8 @@
 	<NcSettingsSection :name="t('activity', 'Daily activity summary')">
 		<NcCheckboxRadioSwitch
 			data-cy-checkbox
-			:checked="activityDigestEnabled"
-			@update:checked="toggleActivityDigestEnabled({ activityDigestEnabled: $event })">
+			v-model="activityDigestEnabled"
+			@update:model-value="toggleActivityDigestEnabled({ activityDigestEnabled: $event })">
 			{{ t('activity', 'Send daily activity summary in the morning') }}
 		</NcCheckboxRadioSwitch>
 	</NcSettingsSection>