diff --git a/src/frontend/src/modals/exportModal/index.tsx b/src/frontend/src/modals/exportModal/index.tsx
index c7ccd927a..8235fc8a3 100644
--- a/src/frontend/src/modals/exportModal/index.tsx
+++ b/src/frontend/src/modals/exportModal/index.tsx
@@ -22,11 +22,13 @@ const ExportModal = forwardRef(
     const [checked, setChecked] = useState(false);
     const currentFlow = useFlowStore((state) => state.currentFlow);
     useEffect(() => {
-      setName(currentFlow!.name);
-      setDescription(currentFlow!.description);
-    }, [currentFlow!.name, currentFlow!.description]);
-    const [name, setName] = useState(currentFlow!.name);
-    const [description, setDescription] = useState(currentFlow!.description);
+      setName(currentFlow?.name ?? "");
+      setDescription(currentFlow?.description ?? "");
+    }, [currentFlow?.name, currentFlow?.description]);
+    const [name, setName] = useState(currentFlow?.name ?? "");
+    const [description, setDescription] = useState(
+      currentFlow?.description ?? "",
+    );
     const [open, setOpen] = useState(false);
 
     return (
diff --git a/src/frontend/src/modals/flowSettingsModal/index.tsx b/src/frontend/src/modals/flowSettingsModal/index.tsx
index 4437ae8c4..8e277455c 100644
--- a/src/frontend/src/modals/flowSettingsModal/index.tsx
+++ b/src/frontend/src/modals/flowSettingsModal/index.tsx
@@ -25,13 +25,13 @@ export default function FlowSettingsModal({
   const flows = useFlowsManagerStore((state) => state.flows);
   const flow = flowData ?? currentFlow;
   useEffect(() => {
-    setName(flow!.name);
-    setDescription(flow!.description);
+    setName(flow?.name ?? "");
+    setDescription(flow?.description ?? "");
   }, [flow?.name, flow?.description, open]);
 
-  const [name, setName] = useState(flow!.name);
-  const [description, setDescription] = useState(flow!.description);
-  const [endpoint_name, setEndpointName] = useState(flow!.endpoint_name ?? "");
+  const [name, setName] = useState(flow?.name ?? "");
+  const [description, setDescription] = useState(flow?.description ?? "");
+  const [endpoint_name, setEndpointName] = useState(flow?.endpoint_name ?? "");
   const [isSaving, setIsSaving] = useState(false);
   const [disableSave, setDisableSave] = useState(true);
   const autoSaving = useFlowsManagerStore((state) => state.autoSaving);