diff --git a/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClientInitializer.java b/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClientInitializer.java
index 1b13a0eccc..fe9d594407 100644
--- a/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClientInitializer.java
+++ b/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClientInitializer.java
@@ -23,6 +23,7 @@ import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpContentDecompressor;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslHandler;
 
 import javax.net.ssl.SSLEngine;
 
@@ -46,8 +47,7 @@ public class HttpSnoopClientInitializer extends ChannelInitializer<SocketChannel
                 SecureChatSslContextFactory.getClientContext().createSSLEngine();
             engine.setUseClientMode(true);
 
-            // FIXME: Port SslHandler to the new API
-            //p.addLast("ssl", new SslHandler(engine));
+            p.addLast("ssl", new SslHandler(engine));
         }
 
         p.addLast("codec", new HttpClientCodec());
diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
index 2462ef0100..303673dd19 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -802,6 +802,7 @@ public class SslHandler
                     break;
                 case FINISHED:
                     setHandshakeSuccess();
+                    wrapLater = true;
                     continue;
                 case NOT_HANDSHAKING:
                     break;