diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index 9fb6d091..627ede45 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -21,7 +21,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
     hideFooterSelectedRowCount, rowModesModel, editMode,
     pageSizeOptions, filterItems, customPageSize, doLoad, applyGridOnReady, applySearch,
     tab, height, maxHeight, pagination = true, serverSorting = false,
-    disablePagingOnGazetteIssue = true, ...props }) {
+    disablePagingOnGazetteIssue = true, hideRowsPerPage = false, ...props }) {
     const intl = useIntl();
     const [_rows, set_rows] = useState([]);
     const [_doLoad, set_doLoad] = useState({});
@@ -359,7 +359,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
                                 count={total}
                                 page={pagerPage}
                                 rowsPerPage={pagerPageSize}
-                                rowsPerPageOptions={loadAllOnGazetteIssue ? [] : _pageSizeOptions}
+                                rowsPerPageOptions={(loadAllOnGazetteIssue || hideRowsPerPage) ? [] : _pageSizeOptions}
                                 labelDisplayedRows={() => {
                                     if (!_rows?.length || total === 0) {
                                         return `0-0 ${intl.formatMessage({ id: "of" })} ${total}`;
@@ -370,7 +370,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
                                         : Math.min(page * pageSize + _rows.length, total);
                                     return `${from}-${to} ${intl.formatMessage({ id: "of" })} ${total}`;
                                 }}
-                                labelRowsPerPage={intl.formatMessage({ id: "rowsPerPage" }) + ":"}
+                                labelRowsPerPage={hideRowsPerPage ? () => "" : intl.formatMessage({ id: "rowsPerPage" }) + ":"}
                                 getItemAriaLabel={(type) => {
                                     if (type === 'previous') {
                                     return intl.formatMessage({ id: 'paginationPrev' });
@@ -381,7 +381,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
                                     return '';
                                 }}
                                 onPageChange={loadAllOnGazetteIssue ? () => {} : handleChangePage}
-                                onRowsPerPageChange={loadAllOnGazetteIssue ? () => {} : handleChangePageSize}
+                                onRowsPerPageChange={(loadAllOnGazetteIssue || hideRowsPerPage) ? () => {} : handleChangePageSize}
                             />
                             );
                         },
diff --git a/src/pages/GFMIS/DataGrid.js b/src/pages/GFMIS/DataGrid.js
index 76618c4a..3c4ca8a5 100644
--- a/src/pages/GFMIS/DataGrid.js
+++ b/src/pages/GFMIS/DataGrid.js
@@ -76,7 +76,7 @@ export default function SearchTable({ previewSearchCriteria, onPreviewGridOnRead
             <FiDataGrid
                 key={previewToken}
                 sx={_sx}
-                rowHeight={80}
+                getRowHeight={() => 'auto'}
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleEditClick}
diff --git a/src/pages/GFMIS/TransactionDataGrid.js b/src/pages/GFMIS/TransactionDataGrid.js
index 1133b7db..9e6d7278 100644
--- a/src/pages/GFMIS/TransactionDataGrid.js
+++ b/src/pages/GFMIS/TransactionDataGrid.js
@@ -117,7 +117,7 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
         <div style={{ width: '100%' }}>
             <FiDataGrid
                 sx={_sx}
-                rowHeight={60}
+                getRowHeight={() => "auto"}
                 columns={columns}
                 height={500} 
                 autoHeight={false}
diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js
index 68b70a1a..d6738f8c 100644
--- a/src/pages/Payment/Search_GLD/DataGrid.js
+++ b/src/pages/Payment/Search_GLD/DataGrid.js
@@ -194,7 +194,7 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
         <div style={{ width: '100%' }}>
             <FiDataGrid
                 sx={_sx}
-                rowHeight={80}
+                getRowHeight={() => 'auto'}
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleEditClick}
diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js
index 7489960f..0827d725 100644
--- a/src/pages/Payment/Search_Public/DataGrid.js
+++ b/src/pages/Payment/Search_Public/DataGrid.js
@@ -119,7 +119,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
         <div style={{ minHeight: 400, width: '100%' }}>
             <FiDataGrid
                 sx={_sx}
-                rowHeight={80}
+                getRowHeight={() => 'auto'}
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleEditDoubleClick}
diff --git a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
index 3d2890f2..42b15030 100644
--- a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
+++ b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
@@ -68,7 +68,7 @@ export default function UserGroupTable({searchCriteria, applyGridOnReady,applySe
             <FiDataGrid
                 columns={columns}
                 customPageSize={10}
-                pageSizeOptions={[10, 15, 20]}
+                hideRowsPerPage
                 onRowDoubleClick={handleRowDoubleClick}
                 applyGridOnReady={applyGridOnReady}
                 applySearch={applySearch}