diff --git a/packages/esm-patient-biometrics-app/src/biometrics/biometrics-overview.scss b/packages/esm-patient-biometrics-app/src/biometrics/biometrics-overview.scss
index 8de3132784..4539b89739 100644
--- a/packages/esm-patient-biometrics-app/src/biometrics/biometrics-overview.scss
+++ b/packages/esm-patient-biometrics-app/src/biometrics/biometrics-overview.scss
@@ -98,10 +98,8 @@
   }
 }
 
-.customRow {
-  display: grid;
-  grid-auto-flow: column;
-  grid-template-columns: max-content;
+.customRow tbody{
+  white-space: nowrap;
 }
 
 .backgroundDataFetchingIndicator {
diff --git a/packages/esm-patient-biometrics-app/src/biometrics/biometrics-pagination.component.tsx b/packages/esm-patient-biometrics-app/src/biometrics/biometrics-pagination.component.tsx
index 3d5183a014..fb5aa13c4c 100644
--- a/packages/esm-patient-biometrics-app/src/biometrics/biometrics-pagination.component.tsx
+++ b/packages/esm-patient-biometrics-app/src/biometrics/biometrics-pagination.component.tsx
@@ -36,9 +36,9 @@ const BiometricsPagination: React.FC<BiometricsPaginationProps> = ({
       <TableContainer>
         <DataTable rows={paginatedBiometrics} headers={tableHeaders} isSortable size="short">
           {({ rows, headers, getHeaderProps, getTableProps }) => (
-            <Table {...getTableProps()}>
+            <Table {...getTableProps()} className={styles.customRow}>
               <TableHead>
-                <TableRow className={styles.customRow}>
+                <TableRow>
                   {headers.map((header) => (
                     <TableHeader
                       className={`${styles.productiveHeading01} ${styles.text02}`}
@@ -53,7 +53,7 @@ const BiometricsPagination: React.FC<BiometricsPaginationProps> = ({
               </TableHead>
               <TableBody>
                 {rows.map((row) => (
-                  <TableRow key={row.id} className={styles.customRow}>
+                  <TableRow key={row.id}>
                     {row.cells.map((cell) => (
                       <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
                     ))}
diff --git a/packages/esm-patient-vitals-app/src/vitals/vitals-overview.scss b/packages/esm-patient-vitals-app/src/vitals/vitals-overview.scss
index dc681df47c..77ab2eb86f 100644
--- a/packages/esm-patient-vitals-app/src/vitals/vitals-overview.scss
+++ b/packages/esm-patient-vitals-app/src/vitals/vitals-overview.scss
@@ -106,10 +106,8 @@
   justify-content: end;
 }
 
-.customRow {
-  display: grid;
-  grid-auto-flow: column;
-  grid-template-columns: max-content;
+.customRow tbody{
+  white-space: nowrap;
 }
 
 .backgroundDataFetchingIndicator {
diff --git a/packages/esm-patient-vitals-app/src/vitals/vitals-pagination.component.tsx b/packages/esm-patient-vitals-app/src/vitals/vitals-pagination.component.tsx
index 1d10aaaaef..aac44b949b 100644
--- a/packages/esm-patient-vitals-app/src/vitals/vitals-pagination.component.tsx
+++ b/packages/esm-patient-vitals-app/src/vitals/vitals-pagination.component.tsx
@@ -35,9 +35,9 @@ const VitalsPagination: React.FC<VitalsPaginationProps> = ({
       <TableContainer>
         <DataTable rows={paginatedVitals} headers={tableHeaders} isSortable={true} size="short">
           {({ rows, headers, getHeaderProps, getTableProps }) => (
-            <Table {...getTableProps()} useZebraStyles>
+            <Table {...getTableProps()} useZebraStyles className={styles.customRow}>
               <TableHead>
-                <TableRow className={styles.customRow}>
+                <TableRow>
                   {headers.map((header) => (
                     <TableHeader
                       className={`${styles.productiveHeading01} ${styles.text02}`}
@@ -52,7 +52,7 @@ const VitalsPagination: React.FC<VitalsPaginationProps> = ({
               </TableHead>
               <TableBody>
                 {rows.map((row) => (
-                  <TableRow key={row.id} className={styles.customRow}>
+                  <TableRow key={row.id}>
                     {row.cells.map((cell) => (
                       <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
                     ))}