diff --git a/src/app/(dashboard)/assignments/page.tsx b/src/app/(dashboard)/assignments/page.tsx
index f89861c..4beaeaa 100644
--- a/src/app/(dashboard)/assignments/page.tsx
+++ b/src/app/(dashboard)/assignments/page.tsx
@@ -18,7 +18,7 @@ export default async function AssignmentsPage(props: {
   const currentPage = searchParams?.page ? parseInt(searchParams.page) : 1
   const search = searchParams?.search || ""
   const { data: assignments, totalPages } =
-    await AssignmentService.findAllWithRecipient({
+    await AssignmentService.findAllWithRecipientPaginated({
       page: currentPage,
       search,
     })
diff --git a/src/services/assignment.service.ts b/src/services/assignment.service.ts
index b7bc98f..1655eb0 100644
--- a/src/services/assignment.service.ts
+++ b/src/services/assignment.service.ts
@@ -7,7 +7,26 @@ import { Assignment, AssignmentWithRecipientItemAsset } from "@/lib/types"
 import { getAuthenticatedUserId } from "./auth.service"
 
 export const AssignmentService = {
-  findAllWithRecipient: async ({
+  findAllWithRecipient: async (): Promise<
+    AssignmentWithRecipientItemAsset[]
+  > => {
+    return prisma.assignment.findMany({
+      where: {
+        returnDate: {
+          equals: null,
+        },
+      },
+      include: {
+        recipient: true,
+        item: true,
+        asset: true,
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    })
+  },
+  findAllWithRecipientPaginated: async ({
     page,
     pageSize,
     search,