diff --git a/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt b/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
index 85911dc..5c6dfa9 100644
--- a/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
+++ b/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
@@ -91,6 +91,8 @@ class UserPreferencesRepository(private val dataStore: DataStore<Preferences>) {
                 if (enable) {
                     if (currentOrder == SortOrder.BY_PRIORITY) {
                         SortOrder.BY_DEADLINE_AND_PRIORITY
+                    } else if (currentOrder == SortOrder.BY_DEADLINE_AND_PRIORITY) {
+                        return@edit
                     } else {
                         SortOrder.BY_DEADLINE
                     }
@@ -121,6 +123,8 @@ class UserPreferencesRepository(private val dataStore: DataStore<Preferences>) {
                 if (enable) {
                     if (currentOrder == SortOrder.BY_DEADLINE) {
                         SortOrder.BY_DEADLINE_AND_PRIORITY
+                    } else if (currentOrder == SortOrder.BY_DEADLINE_AND_PRIORITY) {
+                        return@edit
                     } else {
                         SortOrder.BY_PRIORITY
                     }