diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index d29ae2a96..fa048f726 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import io.realm.RealmQuery
+import io.realm.Sort
 import java.util.*
 
 class TaskFilterHelper {
@@ -115,6 +116,9 @@ class TaskFilterHelper {
                     Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
                 }
             }
+            if (activeFilter != Task.FILTER_DATED) {
+                query = query.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
+            }
         }
         return query
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index e3fcafabe..661b72ce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -146,7 +146,7 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
         if (taskFilterHelper != null) {
             val query = taskFilterHelper.createQuery(unfilteredData)
             if (query != null) {
-                updateData(query.sort("position").findAll())
+                updateData(query.findAll())
             }
         }
     }