diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 1ce585700..54cf14652 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -460,17 +460,10 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
             when (taskType) {
                 TaskType.TODO -> taskFilterHelper.setActiveFilter(TaskType.TODO, Task.FILTER_ACTIVE)
                 TaskType.DAILY -> {
-                    val user = mainActivity?.viewModel?.user?.value
-                    if (user != null) {
-                        if (user.isValid && user.preferences?.dailyDueDefaultView == true) {
+                    mainActivity?.viewModel?.user?.observe(mainActivity){
+                        if (it?.isValid == true && it.preferences?.dailyDueDefaultView == true) {
                             taskFilterHelper.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
                         }
-                    } else {
-                        mainActivity?.viewModel?.user?.observe(mainActivity){
-                            if (it?.isValid == true && it.preferences?.dailyDueDefaultView == true) {
-                                taskFilterHelper.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
-                            }
-                        }
                     }
                 }
             }