diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.java b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
index 8bea54c87..4bede62af 100644
--- a/app/src/main/java/org/tasks/ui/TaskListViewModel.java
+++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
@@ -45,6 +45,8 @@ public class TaskListViewModel extends ViewModel implements Observer<PagedList<T
   private LiveData<PagedList<TaskContainer>> internal;
 
   public void setFilter(@NonNull Filter filter) {
+    boolean manualSort =
+        preferences.showSubtasks() || (filter.supportsManualSort() && preferences.isManualSort());
     setFilter(filter, manualSort);
   }