diff --git a/src/bootstrap/Modal.js b/src/bootstrap/Modal.js
index a1e65c0..efdf6a8 100644
--- a/src/bootstrap/Modal.js
+++ b/src/bootstrap/Modal.js
@@ -88,18 +88,21 @@ export function Modal({ shown, setShown, scrollable, size, children }) {
 ModalHeader.propTypes = {
     setShown: PropTypes.func.isRequired,
     title: PropTypes.string.isRequired,
+    showCloseButton: PropTypes.bool,
 };
 
-export function ModalHeader({ setShown, title }) {
+export function ModalHeader({ setShown, title, showCloseButton = true }) {
     return (
         <div className="modal-header">
             <h1 className="modal-title fs-5">{title}</h1>
-            <button
-                type="button"
-                className="btn-close"
-                onClick={() => setShown(false)}
-                aria-label={_("Close")}
-            />
+            {showCloseButton && (
+                <button
+                    type="button"
+                    className="btn-close"
+                    onClick={() => setShown(false)}
+                    aria-label={_("Close")}
+                />
+            )}
         </div>
     );
 }
diff --git a/src/common/RichTable/RichTable.js b/src/common/RichTable/RichTable.js
index 98e42eb..9eac79f 100644
--- a/src/common/RichTable/RichTable.js
+++ b/src/common/RichTable/RichTable.js
@@ -64,13 +64,15 @@ function RichTable({
         },
     });
 
+    const paginationIsNeeded = tableData.length > pageSize && withPagination;
+
     return (
         <div className="table-responsive">
             <table className="table table-hover text-nowrap">
                 <RichTableHeader table={table} flexRender={flexRender} />
                 <RichTableBody table={table} flexRender={flexRender} />
             </table>
-            {withPagination && (
+            {paginationIsNeeded && (
                 <RichTablePagination
                     table={table}
                     tablePageSize={pageSize}