diff --git a/frontend/components/molecules/dataTable.tsx b/frontend/components/molecules/dataTable.tsx
index a3126da7..26f79895 100644
--- a/frontend/components/molecules/dataTable.tsx
+++ b/frontend/components/molecules/dataTable.tsx
@@ -7,7 +7,6 @@ import {
   TableBody,
   Link,
 } from '@nextui-org/react'
-import { FaInstagram } from 'react-icons/fa'
 import { VscGraphLine } from 'react-icons/vsc'
 import { CgProfile } from 'react-icons/cg'
 
diff --git a/frontend/components/molecules/noresults.tsx b/frontend/components/molecules/noresults.tsx
new file mode 100644
index 00000000..f4f8246b
--- /dev/null
+++ b/frontend/components/molecules/noresults.tsx
@@ -0,0 +1,16 @@
+import { Button } from '@nextui-org/react'
+
+// I have no fucking clue why I had to implement this, but it worked
+// If you don't like it, raise a PR ya loser
+export const NoResults = () => (
+  <div className="flex flex-col items-center justify-center space-y-4 mt-4 mx-4">
+    <h1 className="text-2xl">No results found</h1>
+    <Button
+      className="ml-4"
+      color="primary"
+      onClick={() => window.history.back()}
+      >
+      Go back
+    </Button>
+  </div>
+)
\ No newline at end of file
diff --git a/frontend/components/organisms/homePage.tsx b/frontend/components/organisms/homePage.tsx
index 66e0fe87..7a98b0bb 100644
--- a/frontend/components/organisms/homePage.tsx
+++ b/frontend/components/organisms/homePage.tsx
@@ -8,6 +8,7 @@ import { Filters } from '../molecules/filters'
 import { DataTable } from '../molecules/dataTable'
 import LifterGraphModal from '../molecules/lifterGraphModal'
 import { useRouter } from 'next/router'
+import {NoResults} from "@/components/molecules/noresults";
 
 const lifterLoadMoreQty = 50
 
@@ -67,23 +68,28 @@ function HomePage() {
           year={year}
           handleFilterChange={handleFilterChange}
         />
-        {data && (
-          <DataTable
-            lifters={data}
-            openLifterGraphHandler={lifterName =>
-              setShowLifterGraph(lifterName)
-            }
-          />
+        {data && data.size > 0 && (
+          <>
+            <DataTable
+              lifters={data}
+              openLifterGraphHandler={lifterName =>
+                setShowLifterGraph(lifterName)
+              }
+            />
+            <Button
+              className={'flex justify-center'}
+              aria-label={'Load more results'}
+              color={'primary'}
+              onClick={updateLifterList}
+              isDisabled={false}
+            >
+              Showing {stop} / {data.size} lifters...
+            </Button>
+          </>
+        )}
+        {data?.size === 0 && (
+          <NoResults />
         )}
-        <Button
-          className={'flex justify-center'}
-          aria-label={'Load more results'}
-          color={'primary'}
-          onClick={updateLifterList}
-          isDisabled={false}
-        >
-          Showing {stop} / {data?.size} lifters...
-        </Button>
       </div>
       {showLifterGraph && (
         <LifterGraphModal