diff --git a/src/main/java/org/springframework/hateoas/server/core/WebHandler.java b/src/main/java/org/springframework/hateoas/server/core/WebHandler.java
index 15d961c9..bde984de 100644
--- a/src/main/java/org/springframework/hateoas/server/core/WebHandler.java
+++ b/src/main/java/org/springframework/hateoas/server/core/WebHandler.java
@@ -474,7 +474,7 @@ public class WebHandler {
 
 			RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class);
 
-			if (!(annotation != null && annotation.required()) || parameter.isOptional()) {
+			if (!isRequired() || parameter.isOptional()) {
 				return SKIP_VALUE;
 			}
 
diff --git a/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java
index 19ae9d8e..ca8de0c1 100644
--- a/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java
@@ -471,14 +471,14 @@ class WebMvcLinkBuilderUnitTest extends TestUtils {
 	}
 
 	/**
-	 * @see #331
+	 * @see #331, #545
 	 */
 	@Test
 	void linksToMethodWithRequestParamImplicitlySetToFalse() {
 
 		Link link = linkTo(methodOn(ControllerWithMethods.class).methodForOptionalSizeWithDefaultValue(null)).withSelfRel();
 
-		assertThat(link.getHref()).endsWith("/bar");
+		assertThat(link.getHref()).endsWith("/bar{?size}");
 	}
 
 	/**