diff --git a/packages/ui/src/DataTable/FilterAndSortMenu.js b/packages/ui/src/DataTable/FilterAndSortMenu.js
index 4e48b46c..92cb1202 100644
--- a/packages/ui/src/DataTable/FilterAndSortMenu.js
+++ b/packages/ui/src/DataTable/FilterAndSortMenu.js
@@ -63,9 +63,11 @@ const FilterAndSortMenu = ({
   currentFilter
 }) => {
   const [selectedFilter, setSelectedFilter] = useState(
-    camelCase(getFilterMenuItems(dataType)[0])
+    currentFilter?.selectedFilter ?? camelCase(getFilterMenuItems(dataType)[0])
+  );
+  const [filterValue, setFilterValue] = useState(
+    currentFilter?.filterValue ?? ""
   );
-  const [filterValue, setFilterValue] = useState("");
 
   const handleFilterChange = selectedFilter => {
     if (