diff --git a/client/src/main/java/org/asynchttpclient/netty/ssl/DefaultSslEngineFactory.java b/client/src/main/java/org/asynchttpclient/netty/ssl/DefaultSslEngineFactory.java
index a96f6ffb1..323b75d5d 100644
--- a/client/src/main/java/org/asynchttpclient/netty/ssl/DefaultSslEngineFactory.java
+++ b/client/src/main/java/org/asynchttpclient/netty/ssl/DefaultSslEngineFactory.java
@@ -58,6 +58,9 @@ private SslContext buildSslContext(AsyncHttpClientConfig config) throws SSLExcep
             sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
         }
 
+        sslContextBuilder.endpointIdentificationAlgorithm(
+                config.isDisableHttpsEndpointIdentificationAlgorithm() ? "" : "HTTPS");
+
         return configureSslContextBuilder(sslContextBuilder).build();
     }
 
diff --git a/client/src/main/java/org/asynchttpclient/netty/ssl/SslEngineFactoryBase.java b/client/src/main/java/org/asynchttpclient/netty/ssl/SslEngineFactoryBase.java
index 2d6e5f5ef..7e55ac4de 100644
--- a/client/src/main/java/org/asynchttpclient/netty/ssl/SslEngineFactoryBase.java
+++ b/client/src/main/java/org/asynchttpclient/netty/ssl/SslEngineFactoryBase.java
@@ -19,7 +19,6 @@
 import org.asynchttpclient.SslEngineFactory;
 
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
 
 public abstract class SslEngineFactoryBase implements SslEngineFactory {
 
@@ -30,10 +29,5 @@ protected String domain(String hostname) {
 
     protected void configureSslEngine(SSLEngine sslEngine, AsyncHttpClientConfig config) {
         sslEngine.setUseClientMode(true);
-        if (!config.isDisableHttpsEndpointIdentificationAlgorithm()) {
-            SSLParameters params = sslEngine.getSSLParameters();
-            params.setEndpointIdentificationAlgorithm("HTTPS");
-            sslEngine.setSSLParameters(params);
-        }
     }
 }