diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx
index 92bbca5ba..bd716d793 100644
--- a/Client/src/Components/BasicTable/index.jsx
+++ b/Client/src/Components/BasicTable/index.jsx
@@ -77,9 +77,13 @@ const BasicTable = ({ data, paginated }) => {
     setPage(0); // Reset to first page after changing rows per page
   };
 
-  let displayData = paginated
-    ? data.rows.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
-    : data.rows;
+  let displayData = [];
+
+  if (data && data.rows) {
+    displayData = paginated
+      ? data.rows.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
+      : data.rows;
+  }
 
   if (!data || !data.cols || !data.rows) {
     return <div>No data</div>;
diff --git a/Client/src/Pages/Details/index.jsx b/Client/src/Pages/Details/index.jsx
index 7217ff671..c53054ccd 100644
--- a/Client/src/Pages/Details/index.jsx
+++ b/Client/src/Pages/Details/index.jsx
@@ -105,7 +105,11 @@ const DetailsPage = () => {
     }, 0);
   };
 
-  return <BasicTable data={data} paginated={false} />;
+  return (
+    <div>
+      <BasicTable data={data} paginated={true} />
+    </div>
+  );
 };
 
 export default DetailsPage;