diff --git a/components/EmptyState.tsx b/components/EmptyState.tsx
new file mode 100644
index 00000000..2146c5e0
--- /dev/null
+++ b/components/EmptyState.tsx
@@ -0,0 +1,12 @@
+import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons"
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
+
+export const EmptyState = () => {
+    return (
+        <div className="flex flex-col items-center justify-center min-h-[50vh] p-4 w-full text-center">
+            <FontAwesomeIcon icon={faMagnifyingGlass} className="fa-magnifying-glass" />
+            <h2 className="text-xl font-semibold mb-2" >No results found</h2>
+            <p className="text-gray-500" >Try changing your search term or filters.</p>
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/components/OrganizationList.tsx b/components/OrganizationList.tsx
index be9de6dd..b4b2610a 100644
--- a/components/OrganizationList.tsx
+++ b/components/OrganizationList.tsx
@@ -8,6 +8,7 @@ import { LanguageFilter } from "./LanguageFilter";
 import { OrganizationItem } from "./OrganizationItem";
 import { Grid, Stack } from "@primer/react-brand";
 import { GeneralFilter } from "./GeneralFilter";
+import { EmptyState } from "./EmptyState";
 
 type OrganizationListProps = {
   organizations: Organization[];
@@ -72,9 +73,13 @@ export const OrganizationList = ({ organizations }: OrganizationListProps) => {
               hasMore={hasMoreItems}
               loader={<Loader />}
             >
-              {filteredOrganizations.slice(0, items).map((org) => (
-                <OrganizationItem key={org.id} organization={org} />
-              ))}
+              {filteredOrganizations.length > 0 ?
+                filteredOrganizations.slice(0, items).map((org) => (
+                  <OrganizationItem key={org.id} organization={org} />
+                ))
+                :
+                <EmptyState />
+              }
             </InfiniteScroll>
           </Grid.Column>
         </Grid>
diff --git a/components/RepositoryList.tsx b/components/RepositoryList.tsx
index 34bc5488..abb9225d 100644
--- a/components/RepositoryList.tsx
+++ b/components/RepositoryList.tsx
@@ -10,6 +10,7 @@ import { LanguageFilter } from "./LanguageFilter";
 import { RepositoryItem } from "./RepositoryItem";
 import { SDGFilter } from "./SDGFilter";
 import { Grid, Stack } from "@primer/react-brand";
+import { EmptyState } from "./EmptyState";
 
 type RepositoryListProps = {
   repositories: Repository[];
@@ -84,9 +85,13 @@ export const RepositoryList = ({ repositories, filter }: RepositoryListProps) =>
               hasMore={hasMoreItems}
               loader={<Loader />}
             >
-              {filteredRepositories.slice(0, items).map((repository) => (
-                <RepositoryItem key={repository.id} repository={repository} />
-              ))}
+              {filteredRepositories.length > 0 ?
+                filteredRepositories.slice(0, items).map((repository) => (
+                  <RepositoryItem key={repository.id} repository={repository} />
+                ))
+                :
+                <EmptyState />
+              }
             </InfiniteScroll>
           </Grid.Column>
         </Grid>