diff --git a/packages/web/src/components/AddAppConnection/index.jsx b/packages/web/src/components/AddAppConnection/index.jsx
index 7187624e..f253831b 100644
--- a/packages/web/src/components/AddAppConnection/index.jsx
+++ b/packages/web/src/components/AddAppConnection/index.jsx
@@ -108,7 +108,11 @@ function AddAppConnection(props) {
   if (appAuthClientId) return <React.Fragment />;
 
   return (
-    <Dialog open={true} onClose={onClose} data-test="add-app-connection-dialog">
+    <Dialog
+      open={true}
+      onClose={() => onClose()}
+      data-test="add-app-connection-dialog"
+    >
       <DialogTitle>
         {hasConnection
           ? formatMessage('app.reconnectConnection')
diff --git a/packages/web/src/components/ChooseConnectionSubstep/index.jsx b/packages/web/src/components/ChooseConnectionSubstep/index.jsx
index 7b776705..4792045e 100644
--- a/packages/web/src/components/ChooseConnectionSubstep/index.jsx
+++ b/packages/web/src/components/ChooseConnectionSubstep/index.jsx
@@ -140,8 +140,7 @@ function ChooseConnectionSubstep(props) {
   const handleAddConnectionClose = React.useCallback(
     async (response) => {
       setShowAddConnectionDialog(false);
-      const connectionId = response?.createConnection.id;
-
+      const connectionId = response?.createConnection?.id;
       if (connectionId) {
         await refetch();
         onChange({