diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a5dc973..ad0011279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ changes.
 ### Fixed
 
 - Fix missing off chain references in DRep details [Issue 3490](https://github.com/IntersectMBO/govtool/issues/3490)
+- Fix blank screen and type error on linkReferences when navigating to edit dRep page that has no links [Issue 3714](https://github.com/IntersectMBO/govtool/issues/3714)
 
 ### Changed
 
diff --git a/govtool/frontend/src/components/organisms/EditDRepInfoSteps/EditDRepForm.tsx b/govtool/frontend/src/components/organisms/EditDRepInfoSteps/EditDRepForm.tsx
index d758c7398..1efc085e7 100644
--- a/govtool/frontend/src/components/organisms/EditDRepInfoSteps/EditDRepForm.tsx
+++ b/govtool/frontend/src/components/organisms/EditDRepInfoSteps/EditDRepForm.tsx
@@ -49,8 +49,8 @@ export const EditDRepForm = ({
         qualifications: data?.qualifications ?? "",
         paymentAddress: data?.paymentAddress ?? "",
         image: data?.image ?? "",
-        linkReferences: data.linkReferences ?? [getEmptyReference("Link")],
-        identityReferences: data.identityReferences ?? [
+        linkReferences: data?.linkReferences ?? [getEmptyReference("Link")],
+        identityReferences: data?.identityReferences ?? [
           getEmptyReference("Identity"),
         ],
       });