diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs b/projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs
index 4964b8f867..e9cddde907 100644
--- a/projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs
+++ b/projects/RabbitMQ.Client/client/api/ConnectionFactoryBase.cs
@@ -51,9 +51,7 @@ public static ITcpClient DefaultSocketFactory(AddressFamily addressFamily)
         {
             var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp)
             {
-                NoDelay = true,
-                ReceiveBufferSize = 65536,
-                SendBufferSize = 65536
+                NoDelay = true
             };
             return new TcpClientAdapter(socket);
         }
diff --git a/projects/Unit/TestConnectionFactory.cs b/projects/Unit/TestConnectionFactory.cs
index 225c94f99d..1344a46fd8 100644
--- a/projects/Unit/TestConnectionFactory.cs
+++ b/projects/Unit/TestConnectionFactory.cs
@@ -30,7 +30,9 @@
 //---------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Sockets;
 using RabbitMQ.Client.Exceptions;
+using RabbitMQ.Client.Impl;
 using Xunit;
 
 namespace RabbitMQ.Client.Unit
@@ -69,6 +71,34 @@ public void TestProperties()
             Assert.Equal(cf.Endpoint.MaxMessageSize, mms);
         }
 
+        [Fact]
+        public void TestConnectionFactoryWithCustomSocketFactory()
+        {
+            const int bufsz = 1024;
+
+            ConnectionFactory cf = new()
+            {
+                SocketFactory = (AddressFamily af) =>
+                {
+                    var socket = new Socket(af, SocketType.Stream, ProtocolType.Tcp)
+                    {
+                        SendBufferSize = bufsz,
+                        ReceiveBufferSize = bufsz,
+                        NoDelay = false
+                    };
+                    return new TcpClientAdapter(socket);
+                }
+            };
+
+            ITcpClient c = cf.SocketFactory(AddressFamily.InterNetwork);
+            Assert.IsType<TcpClientAdapter>(c);
+            TcpClientAdapter tcpClientAdapter = (TcpClientAdapter)c;
+            Socket s = tcpClientAdapter.Client;
+            Assert.Equal(bufsz, s.ReceiveBufferSize);
+            Assert.Equal(bufsz, s.SendBufferSize);
+            Assert.False(s.NoDelay);
+        }
+
         [Fact]
         public void TestCreateConnectionUsesSpecifiedPort()
         {