diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue
index 4b0a6d027a..fbe20f383d 100644
--- a/resources/js/requests/components/RequestsListing.vue
+++ b/resources/js/requests/components/RequestsListing.vue
@@ -156,6 +156,7 @@ export default {
       fields: [],
       previousFilter: "",
       previousPmql: "",
+      previousAdvancedFilter: "",
       tableHeaders: [],
       unreadColumnName: "user_viewed_at",
     };
@@ -399,7 +400,7 @@ export default {
 
         const CancelToken = ProcessMaker.apiClient.CancelToken;
 
-        const { pmql, filter } = this.buildPmqlAndFilter();
+        const { pmql, filter, advancedFilter } = this.buildPmqlAndFilter();
 
         // Load from our api client
         ProcessMaker.apiClient
@@ -418,7 +419,7 @@ export default {
             "&order_direction=" +
             this.orderDirection +
             this.additionalParams + 
-            this.getAdvancedFilter(),
+            advancedFilter,
             {
               cancelToken: new CancelToken((c) => {
                 this.cancelToken = c;
@@ -470,7 +471,12 @@ export default {
 
       this.previousPmql = pmql;
 
-      return { pmql, filter };
+      const advancedFilter = this.getAdvancedFilter();
+      if (this.previousAdvancedFilter !== advancedFilter) {
+        this.page = 1;
+      }
+
+      return { pmql, filter, advancedFilter };
 
     },
     handleRowClick(row) {
diff --git a/resources/js/tasks/components/ListMixin.js b/resources/js/tasks/components/ListMixin.js
index 09e77e36d4..897bde8c72 100644
--- a/resources/js/tasks/components/ListMixin.js
+++ b/resources/js/tasks/components/ListMixin.js
@@ -49,6 +49,10 @@ const ListMixin = {
         this.previousPmql = pmql;
         
         let advancedFilter = this.getAdvancedFilter ? this.getAdvancedFilter(): "";
+        if (this.previousAdvancedFilter !== advancedFilter) {
+          this.page = 1;
+        }
+        this.previousAdvancedFilter = advancedFilter;
 
         // Load from our api client
         ProcessMaker.apiClient
diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue
index d0b37e3c95..282d3ae526 100644
--- a/resources/js/tasks/components/TasksList.vue
+++ b/resources/js/tasks/components/TasksList.vue
@@ -221,6 +221,7 @@ export default {
       fields: [],
       previousFilter: "",
       previousPmql: "",
+      previousAdvancedFilter: "",
       tableHeaders: [],
       unreadColumnName: "user_viewed_at",
       rowPosition: {},