diff --git a/ui/src/views/references/ReferenceTableView.vue b/ui/src/views/references/ReferenceTableView.vue
index c5955794c7a05e68cb53cbc9f41cf5ea1c47ca29..77924ac7f2e897ae7bf92e292f90e0095a0d9f8b 100644
--- a/ui/src/views/references/ReferenceTableView.vue
+++ b/ui/src/views/references/ReferenceTableView.vue
@@ -192,7 +192,7 @@ export default {
     const { shallowRefArray: referenceValues, doChangeArray: changeReferenceValues } = useArray();
     const { shallowRefArray: tableValues, doChangeArray: changeTableValues } = useArray();
     const { shallowRefArray: tags, doChangeArray: changeTags } = useArray();
-    const { shallowRefArray: filters } = useArray();
+    const { shallowRefArray: filters, doAddToArray: pushFilters } = useArray();
     const {
       shallowRefArray: referenceTypeForReferencingColumns,
       doChangeArray: changeReferenceTypeForReferencingColumns,
@@ -365,8 +365,9 @@ export default {
         props.refId,
         event.filters
       );
-      changeTotalRows(tableValue.length);
+      changeTotalRows(tableValue.referenceValues.length);
       changeReferenceValues(tableValue.referenceValues);
+      pushFilters(event.filters);
       await setInitialVariables();
       changeIsLoading(false);
     }
@@ -406,17 +407,20 @@ export default {
     }
 
     async function changePage(value) {
-      params.offset = (value - 1) * params.limit;
-      const references = await services.referenceService.getReferenceValues(
-        props.applicationName,
-        props.refId,
-        {
-          _offset_: params.offset,
-          _limit_: params.limit,
+      let references;
+      if(filters.value.length === 0) {
+        params.offset = (value - 1) * params.limit;
+        references = await services.referenceService.getReferenceValues(
+            props.applicationName,
+            props.refId,
+            {
+              _offset_: params.offset,
+              _limit_: params.limit,
+            }
+        );
+        if (references) {
+          changeReferenceValues(references.referenceValues);
         }
-      );
-      if (references) {
-        changeReferenceValues(references.referenceValues);
       }
       if (referenceValues.value) {
         changeTableValues(Object.values(referenceValues.value).map((refValue) => refValue.values));