diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe5a0b678..eb714f3c38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+## Fixed
+
+- #3117 - Dispatcher flush not working in publish mode
+
 ## 6.0.12 - 2023-07-10
 
 ## Fixed
@@ -25,7 +29,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 - #3105 - Redirect Manager: support handling redirects when the request path does not start with /content
 - #3095 - TagsExportServlet to return data in UTF-8 instead of iso-8859-1
 - #3110 - Update lodash to 4.17.21 for fix https://github.com/advisories/GHSA-35jh-r3h4-6jhm
-- #3112 - Update AngularJS to latest v1.8.2 
+- #3112 - Update AngularJS to latest v1.8.2
 - #3118 - Build fails due to guava-31.1-jre.jar: CVE-2023-2976(6.2), move to 32.0.0
 - #3115 - maven: change ui.apps dependency type in ui.content/pom.xml from content-package to zip
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/dispatcher-flush/configuration/configuration.html b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/dispatcher-flush/configuration/configuration.html
index 960e1ba0c3..9745dbb5bd 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/dispatcher-flush/configuration/configuration.html
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/dispatcher-flush/configuration/configuration.html
@@ -19,8 +19,20 @@
 <sly data-sly-use.model="com.adobe.acs.commons.replication.dispatcher.DispatcherFlusherModel"
      data-sly-use.placeholderTemplate="core/wcm/components/commons/v1/templates.html">
 
+    <script>
+        async function submitAcsCommonsDispatcherFlushForm(form) {
+            const response = await fetch('/libs/granite/csrf/token.json');
+            const json = await response.json();
+            form.querySelector('input[name=":cq_csrf_token"]').value = json.token;
+            form.submit();
+        };
+
+    </script>
+
     <form data-sly-test="${model.ready}"
+          onsubmit="submitAcsCommonsDispatcherFlushForm(this); return false;"
           action="${resource.path}.flush.html" method="post">
+        <input type="hidden" name=":cq_csrf_token"/>
         <button class="spectrum-Button spectrum-Button--fill spectrum-Button--cta spectrum-Button--accent spectrum-Button--sizeL"
                 type="submit">Flush paths on Dispatcher(s)
         </button>