diff --git a/libs/ui-components/src/components/Table/TablePagination.tsx b/libs/ui-components/src/components/Table/TablePagination.tsx
index 7d2c2505a..5832f8535 100644
--- a/libs/ui-components/src/components/Table/TablePagination.tsx
+++ b/libs/ui-components/src/components/Table/TablePagination.tsx
@@ -17,7 +17,7 @@ const PaginationTemplate = ({
   isUpdating: boolean;
 }) => {
   const { t } = useTranslation();
-  const pagesCount = Math.ceil((itemCount || 0) / PAGE_SIZE);
+  const pagesCount = Math.ceil(itemCount / PAGE_SIZE);
 
   const page = String(currentPage <= pagesCount ? currentPage : 0);
   const totalPages = String(pagesCount);
@@ -55,6 +55,10 @@ function TablePagination<T extends ApiList>({
     setCurrentPage(newPage);
   };
 
+  if (itemCount === 0) {
+    return null;
+  }
+
   return (
     <Pagination
       isDisabled={isUpdating}