diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
index 6e24558f27..770c3aa1a0 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/SslTransport.java
@@ -129,7 +129,11 @@ public class SslTransport extends TcpTransport {
             sslParams.setEndpointIdentificationAlgorithm("HTTPS");
         }
 
-        ((SSLSocket)this.socket).setSSLParameters(sslParams);
+        if (remoteLocation != null || verifyHostName) {
+            // AMQ-8445 only set SSLParameters if it has been populated before
+            ((SSLSocket) this.socket).setSSLParameters(sslParams);
+        }
+
         super.initialiseSocket(sock);
     }