diff --git a/src/frontend/src/components/forms/ApiForm.tsx b/src/frontend/src/components/forms/ApiForm.tsx
index 1136a0cb9c..a49fc6cbb1 100644
--- a/src/frontend/src/components/forms/ApiForm.tsx
+++ b/src/frontend/src/components/forms/ApiForm.tsx
@@ -389,7 +389,9 @@ export function ApiForm({
       size="xl"
       radius="sm"
       opened={opened}
-      onClose={onClose}
+      onClose={() => {
+        onClose ? onClose() : null;
+      }}
       title={title}
     >
       <Stack>