diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java b/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java
index ce7d97706b..734f96e8ff 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectedListener.java
@@ -63,15 +63,7 @@ public void operationComplete( ChannelFuture future )
             ChannelPipeline pipeline = channel.pipeline();
             pipeline.addLast( new HandshakeHandler( pipelineBuilder, handshakeCompletedPromise, logging ) );
             log.debug( "C: [Bolt Handshake] %s", handshakeString() );
-            ChannelFuture handshakeFuture = channel.writeAndFlush( handshakeBuf() );
-
-            handshakeFuture.addListener( channelFuture ->
-            {
-                if ( !channelFuture.isSuccess() )
-                {
-                    handshakeCompletedPromise.setFailure( channelFuture.cause() );
-                }
-            } );
+            channel.writeAndFlush( handshakeBuf(), channel.voidPromise() );
         }
         else
         {
diff --git a/pom.xml b/pom.xml
index ddcd87b37f..893e138168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.16.Final</version>
+        <version>4.1.22.Final</version>
       </dependency>
       <dependency>
         <groupId>org.hdrhistogram</groupId>