diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
index d586b2290c..e500eecba8 100644
--- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
+++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
@@ -275,7 +275,7 @@ class ServerJwtDslTests {
     }
 
     class NullConverter: Converter<Jwt, Mono<AbstractAuthenticationToken>> {
-        override fun convert(source: Jwt): Mono<AbstractAuthenticationToken>? {
+        override fun convert(source: Jwt): Mono<AbstractAuthenticationToken> {
             return Mono.empty()
         }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 250d18e13d..b5e6f4e523 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ org-jetbrains-kotlin = "2.2.21"
 org-jetbrains-kotlinx = "1.10.2"
 org-mockito = "5.17.0"
 org-opensaml5 = "5.1.6"
-org-springframework = "7.0.1"
+org-springframework = "7.0.2"
 com-password4j = "1.8.4"
 
 [libraries]
diff --git a/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java b/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java
index c4016a1ef3..a1ae19f920 100644
--- a/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java
+++ b/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java
@@ -174,6 +174,12 @@ public class WebAuthnAuthenticationFilter extends AbstractAuthenticationProcessi
 			this.delegate = delegate;
 		}
 
+		@Override
+		public boolean canRead(ResolvableType type, @Nullable MediaType mediaType) {
+			Class<?> clazz = type.resolve();
+			return (clazz != null) ? canRead(clazz, mediaType) : canRead(mediaType);
+		}
+
 		@Override
 		public boolean canRead(Class<?> clazz, @Nullable MediaType mediaType) {
 			return this.delegate.canRead(clazz, mediaType);
@@ -206,6 +212,11 @@ public class WebAuthnAuthenticationFilter extends AbstractAuthenticationProcessi
 			return this.delegate.read(type.getType(), null, inputMessage);
 		}
 
+		@Override
+		public boolean canWrite(ResolvableType targetType, Class<?> valueClass, @Nullable MediaType mediaType) {
+			return this.delegate.canWrite(targetType.getType(), valueClass, mediaType);
+		}
+
 	}
 
 }