diff --git a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
index 0cfdda1b2..1b19a7770 100644
--- a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
+++ b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx
@@ -63,6 +63,7 @@ const PluginSecretFieldDialog: React.FC<PluginSecretFieldDialogProps> = ({
           <>
             <DialogContent>
               <TextField
+                autoComplete="off"
                 fullWidth
                 label={field && field.label}
                 name="value"
diff --git a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
index 9d5b2f135..3cd5cd758 100644
--- a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
+++ b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx
@@ -70,6 +70,7 @@ const SiteSettingsKeyDialog: React.FC<SiteSettingsKeyDialogProps> = ({
               />
               <FormSpacer />
               <TextField
+                autoComplete="off"
                 error={!!formErrors.key}
                 fullWidth
                 label={intl.formatMessage({
@@ -83,6 +84,7 @@ const SiteSettingsKeyDialog: React.FC<SiteSettingsKeyDialogProps> = ({
               />
               <FormSpacer />
               <TextField
+                autoComplete="off"
                 error={!!formErrors.password}
                 fullWidth
                 label={intl.formatMessage({