diff --git a/src/main/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilder.java b/src/main/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilder.java
index 4b612582..fd051035 100644
--- a/src/main/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilder.java
+++ b/src/main/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilder.java
@@ -288,7 +288,7 @@ public class WebFluxLinkBuilder extends TemplateVariableAwareLinkBuilderSupport<
 			ServerHttpRequest request = exchange.getRequest();
 			PathContainer contextPath = request.getPath().contextPath();
 
-			result.builder = UriComponentsBuilder.fromHttpRequest(request) //
+			result.builder = UriComponentsBuilder.fromUri(request.getURI()) //
 					.replacePath(contextPath.toString()) //
 					.replaceQuery("");