diff --git a/web/src/pages/Issues/IssuesPage/IssueList.jsx b/web/src/pages/Issues/IssuesPage/IssueList.jsx
index 487d9bc..a6a6415 100644
--- a/web/src/pages/Issues/IssuesPage/IssueList.jsx
+++ b/web/src/pages/Issues/IssuesPage/IssueList.jsx
@@ -1,37 +1,43 @@
-import IssueItem from './IssueItem'
+import IssueItem from './IssueItem';
 import { useLocation } from 'react-router-dom';
+import IssueNotFound from './IssueNotFound';
 export const IssueList = () => {
   const location = useLocation();
   const { issues } = location.state;
-  console.log(issues)
+  console.log(issues);
   return (
     <>
-    <section className="text-gray-400 body-font min-h-screen">
-      <div className="container px-5 py-24 mx-auto">
-        <div className="flex flex-col text-center w-full mb-20">
-          <h1
-            className="sm:text-3xl text-2xl font-bold title-font mb-4 text-white"
-            
-          >
-            {" "}
-            {" "}
-            <span className="text-4xl text-yellow-400 font-extrabold animate-pulse">
-              Good First Issues
-            </span>{" "}
-          </h1>
+      <section className="text-gray-400 body-font min-h-screen">
+        <div className="container px-5 py-24 mx-auto">
+          <div className="flex flex-col text-center w-full mb-20">
+            <h1 className="sm:text-3xl text-2xl font-bold title-font mb-4 text-white">
+              {' '}
+              <span className="text-4xl text-yellow-400 font-extrabold animate-pulse">
+                Good First Issues
+              </span>{' '}
+            </h1>
+          </div>
+
+          <div className="flex flex-wrap -m-2 justify-center items-center">
+            {issues?.length > 0 ? (
+              issues.map((issue, index) => {
+                return (
+                  <>
+                    <IssueItem
+                      key={index}
+                      title={issue.title}
+                      description={issue.description}
+                      url={issue.url}
+                    />
+                  </>
+                );
+              })
+            ) : (
+              <IssueNotFound />
+            )}
+          </div>
         </div>
-          
-            <div className="flex flex-wrap -m-2 justify-center items-center">{issues.map((issue, index) => {
-              return (<>
-                <IssueItem key={index} title={issue.title} description={issue.description} url={issue.url} />
-              </>);
-                  
-            })}
-            </div>
-            
-        
-      </div>   
-    </section>
+      </section>
     </>
-  )
-}
+  );
+};
diff --git a/web/src/pages/Issues/IssuesPage/IssueNotFound.jsx b/web/src/pages/Issues/IssuesPage/IssueNotFound.jsx
new file mode 100644
index 0000000..e15da37
--- /dev/null
+++ b/web/src/pages/Issues/IssuesPage/IssueNotFound.jsx
@@ -0,0 +1,11 @@
+const IssueNotFound = () => {
+  return (
+    <div className="p-2 lg:w-1/3 md:w-1/2 w-full">
+      <div className="text-red-600 title-font text-4xl text-center font-extrabold">
+        No Issues found
+      </div>
+    </div>
+  );
+};
+
+export default IssueNotFound;