diff --git a/bundestag.io/admin/src/app/list/past/page.tsx b/bundestag.io/admin/src/app/list/past/page.tsx
index ea580072..7788ac78 100644
--- a/bundestag.io/admin/src/app/list/past/page.tsx
+++ b/bundestag.io/admin/src/app/list/past/page.tsx
@@ -34,21 +34,27 @@ export default async function Page({ searchParams }: { searchParams: { page?: st
   return (
     <>
       <h1>Past procedures</h1>
-      <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
-
-      {procedures.map((procedure) => (
-        <Entry
-          key={procedure.id}
-          title={procedure.title}
-          procedureId={procedure.procedureId}
-          votes={procedure.customData?.voteResults.partyVotes.map((vote) => ({
-            party: vote.party,
-            decision: vote.main,
-          }))}
-        />
-      ))}
-
-      <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+
+      {totalPages === 0 && <p>There are no past procedures.</p>}
+      {totalPages > 0 && (
+        <>
+          <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+
+          {procedures.map((procedure) => (
+            <Entry
+              key={procedure.id}
+              title={procedure.title}
+              procedureId={procedure.procedureId}
+              votes={procedure.customData?.voteResults.partyVotes.map((vote) => ({
+                party: vote.party,
+                decision: vote.main,
+              }))}
+            />
+          ))}
+
+          <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+        </>
+      )}
     </>
   );
 }
diff --git a/bundestag.io/admin/src/app/list/upcoming/page.tsx b/bundestag.io/admin/src/app/list/upcoming/page.tsx
index 7018ab70..038282a2 100644
--- a/bundestag.io/admin/src/app/list/upcoming/page.tsx
+++ b/bundestag.io/admin/src/app/list/upcoming/page.tsx
@@ -35,21 +35,26 @@ export default async function Page({ searchParams }: { searchParams: { page?: st
     <>
       <h1>Upcoming procedures</h1>
 
-      <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
-
-      {procedures.map((procedure) => (
-        <Entry
-          key={procedure.id}
-          title={procedure.title}
-          procedureId={procedure.procedureId}
-          votes={procedure.customData?.voteResults.partyVotes.map((vote) => ({
-            party: vote.party,
-            decision: vote.main,
-          }))}
-        />
-      ))}
-
-      <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+      {totalPages === 0 && <p>There are no upcoming procedures.</p>}
+      {totalPages > 0 && (
+        <>
+          <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+
+          {procedures.map((procedure) => (
+            <Entry
+              key={procedure.id}
+              title={procedure.title}
+              procedureId={procedure.procedureId}
+              votes={procedure.customData?.voteResults.partyVotes.map((vote) => ({
+                party: vote.party,
+                decision: vote.main,
+              }))}
+            />
+          ))}
+
+          <PaginationNavigation currentPage={currentPage} totalPages={totalPages} />
+        </>
+      )}
     </>
   );
 }