diff --git a/web/src/main/java/org/springframework/security/web/FormPostRedirectStrategy.java b/web/src/main/java/org/springframework/security/web/FormPostRedirectStrategy.java
index e6a2aff459..584730cdcc 100644
--- a/web/src/main/java/org/springframework/security/web/FormPostRedirectStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/FormPostRedirectStrategy.java
@@ -101,7 +101,7 @@ public final class FormPostRedirectStrategy implements RedirectStrategy {
 		// @formatter:off
 		final String html = REDIRECT_PAGE_TEMPLATE
 			// Clear the query string as we don't want that to be part of the form action URL
-			.replace("{{action}}", HtmlUtils.htmlEscape(uriComponentsBuilder.query(null).build().toUriString()))
+			.replace("{{action}}", HtmlUtils.htmlEscape(uriComponentsBuilder.replaceQuery(null).build().toUriString()))
 			.replace("{{params}}", hiddenInputsHtmlBuilder.toString())
 			.replace("{{nonce}}", HtmlUtils.htmlEscape(nonce));
 		// @formatter:on
diff --git a/web/src/main/java/org/springframework/security/web/server/FormPostServerRedirectStrategy.java b/web/src/main/java/org/springframework/security/web/server/FormPostServerRedirectStrategy.java
index 96b36a1d62..9c3988602e 100644
--- a/web/src/main/java/org/springframework/security/web/server/FormPostServerRedirectStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/server/FormPostServerRedirectStrategy.java
@@ -105,7 +105,7 @@ public final class FormPostServerRedirectStrategy implements ServerRedirectStrat
 		// @formatter:off
 		final String html = REDIRECT_PAGE_TEMPLATE
 			// Clear the query string as we don't want that to be part of the form action URL
-			.replace("{{action}}", HtmlUtils.htmlEscape(uriComponentsBuilder.query(null).build().toUriString()))
+			.replace("{{action}}", HtmlUtils.htmlEscape(uriComponentsBuilder.replaceQuery(null).build().toUriString()))
 			.replace("{{params}}", hiddenInputsHtmlBuilder.toString())
 			.replace("{{nonce}}", HtmlUtils.htmlEscape(nonce));
 		// @formatter:on