diff --git a/CHANGELOG.md b/CHANGELOG.md
index e423a96..bebf002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
   Remove unused and abandoned package `webmozart/path-util`.
 - [PR-167](https://github.com/OS2Forms/os2forms/pull/167)
   Adding os2forms_digital_signature module
+- [PR-184](https://github.com/OS2Forms/os2forms/pull/184)
+  - Patches `coc_forms_auto_export` to ensure settings can be saved upon initial
+    attempt, cf. [Unable to save initial settings due to unfocusable form control](https://www.drupal.org/project/coc_forms_auto_export/issues/3531004)
 - [PR-222](https://github.com/OS2Forms/os2forms/pull/222)
   Correctly sets sender label on Maestro digital post notifications.
 - [OS-199] Remove modules that are not used and not covered by central maintenance from OS2forms
diff --git a/composer.json b/composer.json
index 7987989..9d38733 100644
--- a/composer.json
+++ b/composer.json
@@ -113,7 +113,8 @@
         "enable-patching": true,
         "patches": {
             "drupal/coc_forms_auto_export": {
-                "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff"
+                "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff",
+                "3531004: Unable to save initial settings due to unfocusable form control": "https://www.drupal.org/files/issues/2025-06-19/text_area_with_text_edit_always_fails_reqired_set_via_states.patch"
             },
             "drupal/core": {
                 "Allow conditionals based on computed twig (https://www.drupal.org/project/webform/issues/3481569)": "https://www.drupal.org/files/issues/2024-11-05/revert-core-states.patch"