diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
index eacbadf534..c808450e69 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
@@ -79,7 +79,7 @@ const Checklist: React.FC<Props> = React.memo((props) => {
   const Icon = ICONS[props.type];
 
   const hasHelpText =
-    props.data.policyRef || props.data.info || props.data.howMeasured;
+    props.data?.policyRef || props.data?.info || props.data?.howMeasured;
 
   return (
     <>
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
index cc73a9600c..30b80ff3d0 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Question.tsx
@@ -63,7 +63,7 @@ const Question: React.FC<Props> = React.memo((props) => {
   const iconTitleAccess = props.type === "Error" ? "Error" : undefined;
 
   const hasHelpText =
-    props.data.policyRef || props.data.info || props.data.howMeasured;
+    props.data?.policyRef || props.data?.info || props.data?.howMeasured;
 
   return (
     <>