diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx
index b1aa8efc5..a3fed63ec 100644
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx
+++ b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-button.tsx
@@ -5,14 +5,11 @@ import Link from 'next/link';
 import { Edit } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
-import { Document, Recipient, User } from '@documenso/prisma/client';
+import { Document } from '@documenso/prisma/client';
 import { Button } from '@documenso/ui/primitives/button';
 
 export type DataTableActionButtonProps = {
-  row: Document & {
-    User: Pick<User, 'id' | 'name' | 'email'>;
-    Recipient: Recipient[];
-  };
+  row: Pick<Document, 'id'>;
 };
 
 export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
index 4788033b1..84d7b063f 100644
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/admin/documents/data-table-action-dropdown.tsx
@@ -18,7 +18,6 @@ import {
 export type DataTableActionDropdownProps = {
   row: Document & {
     User: Pick<User, 'id' | 'name' | 'email'>;
-    Recipient: Recipient[];
   };
 };
 
@@ -29,7 +28,6 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
     return null;
   }
 
-  const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
   // const isRecipient = !!recipient;
   // const isDraft = row.status === DocumentStatus.DRAFT;
   // const isPending = row.status === DocumentStatus.PENDING;
@@ -39,15 +37,9 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
   const onDownloadClick = async () => {
     let document: DocumentWithData | null = null;
 
-    if (!recipient) {
-      document = await trpc.document.getDocumentById.query({
-        id: row.id,
-      });
-    } else {
-      document = await trpc.document.getDocumentByToken.query({
-        token: recipient.token,
-      });
-    }
+    document = await trpc.document.getDocumentById.query({
+      id: row.id,
+    });
 
     const documentData = document?.documentData;
 
diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table-title.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table-title.tsx
deleted file mode 100644
index c04f9f13d..000000000
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table-title.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { useSession } from 'next-auth/react';
-import { match } from 'ts-pattern';
-
-import { Document, Recipient, User } from '@documenso/prisma/client';
-
-export type DataTableTitleProps = {
-  row: Document & {
-    User: Pick<User, 'id' | 'name' | 'email'>;
-    Recipient: Recipient[];
-  };
-};
-
-export const DataTableTitle = ({ row }: DataTableTitleProps) => {
-  const { data: session } = useSession();
-
-  if (!session) {
-    return null;
-  }
-
-  const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
-
-  const isOwner = row.User.id === session.user.id;
-  const isRecipient = !!recipient;
-
-  return match({
-    isOwner,
-    isRecipient,
-  })
-    .with({ isOwner: true }, () => (
-      <Link
-        href={`/documents/${row.id}`}
-        title={row.title}
-        className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]"
-      >
-        {row.title}
-      </Link>
-    ))
-    .with({ isRecipient: true }, () => (
-      <Link
-        href={`/sign/${recipient?.token}`}
-        title={row.title}
-        className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]"
-      >
-        {row.title}
-      </Link>
-    ))
-    .otherwise(() => (
-      <span className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]">
-        {row.title}
-      </span>
-    ));
-};
diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
index 1d121742a..cef49b3df 100644
--- a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
+++ b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx
@@ -19,7 +19,6 @@ import { LocaleDate } from '~/components/formatter/locale-date';
 
 import { DataTableActionButton } from './data-table-action-button';
 import { DataTableActionDropdown } from './data-table-action-dropdown';
-import { DataTableTitle } from './data-table-title';
 
 export type DocumentsDataTableProps = {
   results: FindResultSet<
@@ -60,7 +59,18 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
           },
           {
             header: 'Title',
-            cell: ({ row }) => <DataTableTitle row={row.original} />,
+            accessorKey: 'title',
+            cell: ({ row }) => {
+              return (
+                <Link
+                  title={row.original.title}
+                  className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]"
+                  href={`/documents/${row.original.id}`}
+                >
+                  {row.original.title}
+                </Link>
+              );
+            },
           },
           {
             header: 'Owner',