diff --git a/packages/client/src/components/app/blocks/FormBlock.svelte b/packages/client/src/components/app/blocks/FormBlock.svelte
index d1d1a0a22f..3311ddd7bb 100644
--- a/packages/client/src/components/app/blocks/FormBlock.svelte
+++ b/packages/client/src/components/app/blocks/FormBlock.svelte
@@ -48,9 +48,6 @@
     },
     {
       "##eventHandlerType": "Close Screen Modal",
-      parameters: {
-        url: actionUrl,
-      },
     },
     {
       "##eventHandlerType": "Navigate To",
@@ -71,9 +68,6 @@
     },
     {
       "##eventHandlerType": "Close Screen Modal",
-      parameters: {
-        url: actionUrl,
-      },
     },
     {
       "##eventHandlerType": "Navigate To",
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index e44ed2451c..6fcef37182 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -225,7 +225,10 @@ const changeFormStepHandler = async (action, context) => {
 }
 
 const closeScreenModalHandler = action => {
-  let { url } = action.parameters
+  let url
+  if (action?.parameters) {
+    url = action.parameters.url
+  }
   // Emit this as a window event, so parent screens which are iframing us in
   // can close the modal
   window.parent.postMessage({ type: "close-screen-modal", url })