diff --git a/cypress/integration/user/settings.spec.js b/cypress/integration/user/settings.spec.js
index c2d20d087..36467bae7 100644
--- a/cypress/integration/user/settings.spec.js
+++ b/cypress/integration/user/settings.spec.js
@@ -36,7 +36,6 @@ describe('User Settings', () => {
 			.contains('Save')
 			.click()
 
-		cy.wait(3000) // Wait for the request to finish
 		cy.get('.global-notification')
 			.should('contain', 'Success')
 		cy.get('.navbar .user .username')
diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index d7c2dff01..99e4a0b23 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -440,7 +440,7 @@ export default {
 		updateSettings() {
 			localStorage.setItem(playSoundWhenDoneKey, this.playSoundWhenDone)
 			saveLanguage(this.language)
-			this.settings.defaultListId = this.defaultList.id
+			this.settings.defaultListId = this.defaultList ? this.defaultList.id : 0
 
 			this.userSettingsService.update(this.settings)
 				.then(() => {