diff --git a/web/libs/datamanager/src/stores/AppStore.js b/web/libs/datamanager/src/stores/AppStore.js
index b381a25230b4..7971cb9f72af 100644
--- a/web/libs/datamanager/src/stores/AppStore.js
+++ b/web/libs/datamanager/src/stores/AppStore.js
@@ -635,14 +635,17 @@ export const AppStore = types
       };
 
       if (actionId === "next_task") {
-        if (labelStreamMode === "all") {
+        const isSelectAll = actionParams.selectedItems.all === true;
+        const isAllLabelStreamMode = labelStreamMode === "all";
+        const isFilteredLabelStreamMode = labelStreamMode === "filtered";
+        if (isAllLabelStreamMode && !isSelectAll) {
           delete actionParams.filters;
 
           if (actionParams.selectedItems.all === false && actionParams.selectedItems.included.length === 0) {
             delete actionParams.selectedItems;
             delete actionParams.ordering;
           }
-        } else if (labelStreamMode === "filtered") {
+        } else if (isFilteredLabelStreamMode) {
           delete actionParams.selectedItems;
         }
       }