diff --git a/src/pages/Tracker/Tracker.tsx b/src/pages/Tracker/Tracker.tsx
index 576f39bf..87c8e918 100644
--- a/src/pages/Tracker/Tracker.tsx
+++ b/src/pages/Tracker/Tracker.tsx
@@ -351,39 +351,52 @@ const Home: React.FC = () => {
               </TableHead>
 
               <TableBody>
-                {currentFilteredData.map((item) => (
-                  <TableRow key={item.id}>
-
-                    <TableCell sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+                {totalCount === 0 ? (
+                  <TableRow>
+                    <TableCell colSpan={4} align="center" sx={{ py: 6, color: "text.secondary", textAlign: "center" }}>
+                      {tab === 0 ? "No issues found for this user" : "No pull requests available"}
+                    </TableCell>
+                  </TableRow>
+                ) : 
+               
+                currentFilteredData.length === 0 ? (
+                  <TableRow>
+                    <TableCell colSpan={4} align="center" sx={{ py: 6, color: "text.secondary", textAlign: "center" }}>
+                      No matches found on this page. Try resetting your filters or changing pages.
+                    </TableCell>
+                  </TableRow>
+                ) : (
+                 
+                  currentFilteredData.map((item) => (
+                    <TableRow key={item.id}>
+                      <TableCell sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
                         {getStatusIcon(item)}
                         <Link
-                            href={item.html_url}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            underline="hover"
-                            sx={{ color: theme.palette.primary.main }}
+                          href={item.html_url}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          underline="hover"
+                          sx={{ color: theme.palette.primary.main }}
                         >
-                            {item.title}
+                          {item.title}
                         </Link>
-                    </TableCell>
-
-
-                    <TableCell align="center">
-                      {item.repository_url.split("/").slice(-1)[0]}
-                    </TableCell>
-
-                    <TableCell align="center">
-                      {item.pull_request?.merged_at ? "merged" : item.state}
-                    </TableCell>
-
-                    <TableCell>{formatDate(item.created_at)}</TableCell>
-
-                  </TableRow>
-                ))}
+                      </TableCell>
+              
+                      <TableCell align="center">
+                        {item.repository_url.split("/").slice(-1)[0]}
+                      </TableCell>
+              
+                      <TableCell align="center">
+                        {item.pull_request?.merged_at ? "merged" : item.state}
+                      </TableCell>
+              
+                      <TableCell>{formatDate(item.created_at)}</TableCell>
+                    </TableRow>
+                  ))
+                )}
               </TableBody>
 
             </Table>
-
             <TablePagination
               component="div"
               count={totalCount}