diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java
index d788428e83..c9bf7cb78a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java
@@ -195,7 +195,7 @@ public class ReactorNettyTcpClient<P> implements TcpOperations<P> {
 
 		ChannelGroupFuture close = this.channelGroup.close();
 		Mono<Void> completion = FutureMono.from(close)
-				.doAfterTerminate((x, e) -> {
+				.doOnSuccessOrError((x, e) -> {
 					// TODO: https://github.com/reactor/reactor-netty/issues/24
 					shutdownGlobalResources();