diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java
index a29a4c7e33..fbeef271d4 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/DefaultReactiveOAuth2AuthorizedClientManager.java
@@ -139,14 +139,13 @@ public final class DefaultReactiveOAuth2AuthorizedClientManager implements React
 									.defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ?
 											authorizeRequest.getAuthorizedClient() : authorizedClient);
 						})
-						.switchIfEmpty(Mono.deferWithContext(context ->
+						.switchIfEmpty(Mono.defer(() ->
 								// Authorize
 								this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId)
 										.switchIfEmpty(Mono.error(() -> new IllegalArgumentException(
 												"Could not find ClientRegistration with id '" + clientRegistrationId + "'")))
 										.flatMap(clientRegistration -> authorizationContext(authorizeRequest, clientRegistration))
 										.flatMap(authorizationContext -> authorize(authorizationContext, principal, serverWebExchange))
-										.subscriberContext(context)
 								)
 						));
 	}
diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java
index 23232bd30a..8291e26704 100644
--- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java
+++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java
@@ -540,14 +540,13 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements
 								.defaultIfEmpty(authorizeRequest.getAuthorizedClient() != null ?
 										authorizeRequest.getAuthorizedClient() : authorizedClient);
 					})
-					.switchIfEmpty(Mono.deferWithContext(context ->
+					.switchIfEmpty(Mono.defer(() ->
 						// Authorize
 						this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId)
 								.switchIfEmpty(Mono.error(() -> new IllegalArgumentException(
 										"Could not find ClientRegistration with id '" + clientRegistrationId + "'")))
 								.flatMap(clientRegistration -> Mono.just(OAuth2AuthorizationContext.withClientRegistration(clientRegistration).principal(principal).build()))
 								.flatMap(authorizationContext -> authorize(authorizationContext, principal))
-								.subscriberContext(context)
 					));
 		}