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 3f175b33fd..b60bb76765 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -944,18 +944,12 @@ public class SslHandler
                     if (!future.isSuccess()) {
                         ctx.pipeline().fireExceptionCaught(future.cause());
                         ctx.close();
-                    } else {
-                        // Send the event upstream after the handshake was completed without an error.
-                        //
-                        // See https://github.com/netty/netty/issues/358
-                       ctx.fireChannelActive();
                     }
-
                 }
             });
-        } else {
-            ctx.fireChannelActive();
         }
+
+        ctx.fireChannelActive();
     }
 
     private void safeClose(