diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
index c77bd1437..49cb0a8b0 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
@@ -185,19 +185,19 @@ const ListBuckets = ({
     return <Moment>{date}</Moment>;
   };
 
-  const filteredRecords = records
-    .filter((b: Bucket) => {
-      if (filterBuckets === "") {
+  const filteredRecords = records.filter((b: Bucket) => {
+    if (filterBuckets === "") {
+      return true;
+    } else {
+      if (b.name.indexOf(filterBuckets) >= 0) {
         return true;
       } else {
-        if (b.name.indexOf(filterBuckets) >= 0) {
-          return true;
-        } else {
-          return false;
-        }
+        return false;
       }
-    })
-    .slice(offset, offset + rowsPerPage);
+    }
+  });
+
+  const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);
 
   return (
     <React.Fragment>
@@ -269,13 +269,13 @@ const ListBuckets = ({
                 },
               ]}
               isLoading={loading}
-              records={filteredRecords}
+              records={showInPage}
               entityName="Buckets"
               idField="name"
               paginatorConfig={{
                 rowsPerPageOptions: [5, 10, 25],
                 colSpan: 3,
-                count: totalRecords,
+                count: filteredRecords.length,
                 rowsPerPage: rowsPerPage,
                 page: page,
                 SelectProps: {
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
index 3ac1dc09f..4c710bd9b 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
+++ b/portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx
@@ -163,14 +163,14 @@ const BrowseBuckets = ({
     }
   };
 
-  const filteredRecords = records
-    .filter((b: Bucket) => {
-      if (filterBuckets === "") {
-        return true;
-      }
-      return b.name.indexOf(filterBuckets) >= 0;
-    })
-    .slice(offset, offset + rowsPerPage);
+  const filteredRecords = records.filter((b: Bucket) => {
+    if (filterBuckets === "") {
+      return true;
+    }
+    return b.name.indexOf(filterBuckets) >= 0;
+  });
+
+  const showInPage = filteredRecords.slice(offset, offset + rowsPerPage);
 
   const handleChangePage = (event: unknown, newPage: number) => {
     setPage(newPage);
@@ -273,7 +273,7 @@ const BrowseBuckets = ({
               },
             ]}
             isLoading={loading}
-            records={filteredRecords}
+            records={showInPage}
             entityName="Buckets"
             idField="name"
             paginatorConfig={{