diff --git a/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx b/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
index 71f9482a0..6a074dbc7 100644
--- a/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
@@ -142,7 +142,7 @@ export default function DocumentDetailPage(props: Props) {
   const currentVersion =
     document.versions.edges.find((v) => v.node.id === versionId)?.node ??
     document.versions.edges[0].node;
-  const signatures = currentVersion.signatures.edges.map((s) => s.node);
+  const signatures = currentVersion.signatures?.edges?.map((s) => s.node) ?? [];
   const signedSignatures = signatures.filter((s) => s.state === "SIGNED");
   const isDraft = currentVersion.status === "DRAFT";
   const [publishDocumentVersion, isPublishing] = useMutationWithToasts(
diff --git a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
index 0d6c3a565..dde2e2f04 100644
--- a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
@@ -244,7 +244,7 @@ function DocumentRow({
   const lastVersion = document.versions.edges[0].node;
   const isDraft = lastVersion.status === "DRAFT";
   const { __, dateFormat } = useTranslate();
-  const signatures = lastVersion.signatures.edges.map((edge) => edge.node);
+  const signatures = lastVersion.signatures?.edges?.map((edge) => edge.node) ?? [];
   const signedCount = signatures.filter(
     (signature) => signature.state === "SIGNED"
   ).length;
diff --git a/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx b/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
index ce859269e..01d2ab110 100644
--- a/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
+++ b/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
@@ -34,13 +34,21 @@ export default function DocumentSignaturesTab() {
 }
 
 function SignatureList(props: { version: Version }) {
-  const signatures = props.version.signatures.edges.map((edge) => edge.node);
+  const signatures = props.version.signatures?.edges?.map((edge) => edge.node) ?? [];
   const { __ } = useTranslate();
   const signatureMap = new Map(signatures.map((s) => [s.signedBy.id, s]));
   const organizationId = useOrganizationId();
   const people = usePeople(organizationId);
   const signable = props.version.status === "PUBLISHED";
 
+  if (!props.version.signatures) {
+    return (
+      <div className="text-center text-sm text-txt-tertiary py-3">
+        {__("Loading signatures...")}
+      </div>
+    );
+  }
+
   if (people.length === 0) {
     return (
       <div className="text-center text-sm text-txt-tertiary py-3">