diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/GenericSecretInput.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/GenericSecretInput.tsx
index c1025ffd0..895dbf015 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/GenericSecretInput.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/GenericSecretInput.tsx
@@ -104,7 +104,15 @@ export const GenericSecretInput = ({
         </Grid.Col>
         <Grid.Col xs={12} md={6}>
           <Flex gap={10} justify="end" align="end">
-            <Button variant="subtle" color="gray" px="xl">
+            <Button
+              onClick={() => {
+                setDisplayUpdateField(false);
+                onClickUpdateButton(undefined);
+              }}
+              variant="subtle"
+              color="gray"
+              px="xl"
+            >
               {t('integration.secrets.clear')}
             </Button>
             {displayUpdateField === true ? (
diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer.tsx
index 145dd3f00..c5ebc14af 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer.tsx
@@ -52,6 +52,7 @@ export const IntegrationOptionsRenderer = ({ form }: IntegrationOptionsRendererP
             <GenericSecretInput
               onClickUpdateButton={(value) => {
                 form.setFieldValue(`integration.properties.${index}.value`, value);
+                form.setFieldValue(`integration.properties.${index}.isDefined`, value !== undefined);
               }}
               key={`input-${property}`}
               label={`${property} (potentionally unmapped)`}
@@ -68,6 +69,7 @@ export const IntegrationOptionsRenderer = ({ form }: IntegrationOptionsRendererP
           <GenericSecretInput
             onClickUpdateButton={(value) => {
               form.setFieldValue(`integration.properties.${index}.value`, value);
+              form.setFieldValue(`integration.properties.${index}.isDefined`, value !== undefined);
             }}
             key={`input-${definition.label}`}
             label={definition.label}