diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
index 91f1845ac7..cb4eff363d 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
@@ -369,8 +369,8 @@ public class TcpTransportServer extends TransportServerThreadSupport {
                     .valueOf(minmumWireFormatVersion));
             options.put("trace", Boolean.valueOf(trace));
             options.put("soTimeout", Integer.valueOf(soTimeout));
-            options.put("soTimeout", Integer.valueOf(soTimeout));
-            options.put("connectionTimeout", Integer.valueOf(socketBufferSize));
+            options.put("socketBufferSize", Integer.valueOf(socketBufferSize));
+            options.put("connectionTimeout", Integer.valueOf(connectionTimeout));
             options.put("logWriterName", logWriterName);
             options
                     .put("dynamicManagement", Boolean