diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
index 62f5de38de..3eab48382d 100644
--- a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
@@ -57,8 +57,9 @@ export default function Component(props: Props) {
     props.previouslySubmittedData?.data?.[props.fn] ||
     passport.data?.["property.boundary"];
   const previousArea =
-    props.previouslySubmittedData?.data?.[props.fn] ||
+    props.previouslySubmittedData?.data?.[`${props.fn}.area`] ||
     passport.data?.["property.boundary.area"];
+  
   const [boundary, setBoundary] = useState<Boundary>(previousBoundary);
   const [area, setArea] = useState<number | undefined>(previousArea);
   const [mapValidationError, setMapValidationError] = useState<string>();
diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts b/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts
index 69875aa276..6cd0b3927f 100644
--- a/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts
+++ b/editor.planx.uk/src/@planx/components/DrawBoundary/model.ts
@@ -28,7 +28,7 @@ export const parseDrawBoundary = (
     data?.descriptionForUploading ||
     defaultContent?.["descriptionForUploading"],
   hideFileUpload: data?.hideFileUpload || defaultContent?.["hideFileUpload"],
-  fn: data?.fn || defaultContent?.["fn"],
+  fn: defaultContent?.["fn"], // input is disabled, no need to account for data?.fn
   info: data?.info || defaultContent?.["info"],
   policyRef: data?.policyRef || defaultContent?.["policyRef"],
   howMeasured: data?.howMeasured || defaultContent?.["howMeasured"],