diff --git a/client.go b/client.go
index 826ca8f4..6492a697 100644
--- a/client.go
+++ b/client.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/lucas-clemente/quic-go/internal/handshake"
 	"github.com/lucas-clemente/quic-go/internal/protocol"
 	"github.com/lucas-clemente/quic-go/internal/utils"
 	"github.com/lucas-clemente/quic-go/internal/wire"
@@ -355,20 +354,6 @@ func (c *client) handleVersionNegotiationPacket(p *receivedPacket) {
 }
 
 func (c *client) createNewTLSSession(_ protocol.VersionNumber) {
-	params := &handshake.TransportParameters{
-		InitialMaxStreamDataBidiRemote: protocol.InitialMaxStreamData,
-		InitialMaxStreamDataBidiLocal:  protocol.InitialMaxStreamData,
-		InitialMaxStreamDataUni:        protocol.InitialMaxStreamData,
-		InitialMaxData:                 protocol.InitialMaxData,
-		IdleTimeout:                    c.config.IdleTimeout,
-		MaxBidiStreamNum:               protocol.StreamNum(c.config.MaxIncomingStreams),
-		MaxUniStreamNum:                protocol.StreamNum(c.config.MaxIncomingUniStreams),
-		MaxAckDelay:                    protocol.MaxAckDelayInclGranularity,
-		AckDelayExponent:               protocol.AckDelayExponent,
-		DisableMigration:               true,
-		ActiveConnectionIDLimit:        protocol.MaxActiveConnectionIDs,
-	}
-
 	c.mutex.Lock()
 	c.session = newClientSession(
 		c.conn,
@@ -378,7 +363,6 @@ func (c *client) createNewTLSSession(_ protocol.VersionNumber) {
 		c.config,
 		c.tlsConf,
 		c.initialPacketNumber,
-		params,
 		c.initialVersion,
 		c.logger,
 		c.version,
diff --git a/client_test.go b/client_test.go
index 66f64788..ae9c78ee 100644
--- a/client_test.go
+++ b/client_test.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	"github.com/lucas-clemente/quic-go/internal/handshake"
 	"github.com/lucas-clemente/quic-go/internal/protocol"
 	"github.com/lucas-clemente/quic-go/internal/utils"
 	"github.com/lucas-clemente/quic-go/internal/wire"
@@ -38,7 +37,6 @@ var _ = Describe("Client", func() {
 			conf *Config,
 			tlsConf *tls.Config,
 			initialPacketNumber protocol.PacketNumber,
-			params *handshake.TransportParameters,
 			initialVersion protocol.VersionNumber,
 			logger utils.Logger,
 			v protocol.VersionNumber,
@@ -141,7 +139,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -172,7 +169,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				tlsConf *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -203,7 +199,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				tlsConf *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -239,7 +234,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -277,7 +271,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -318,7 +311,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -362,7 +354,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -407,7 +398,6 @@ var _ = Describe("Client", func() {
 				_ *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				_ *handshake.TransportParameters,
 				_ protocol.VersionNumber,
 				_ utils.Logger,
 				_ protocol.VersionNumber,
@@ -527,7 +517,6 @@ var _ = Describe("Client", func() {
 				configP *Config,
 				_ *tls.Config,
 				_ protocol.PacketNumber,
-				params *handshake.TransportParameters,
 				_ protocol.VersionNumber, /* initial version */
 				_ utils.Logger,
 				versionP protocol.VersionNumber,
@@ -576,7 +565,6 @@ var _ = Describe("Client", func() {
 					_ *Config,
 					_ *tls.Config,
 					_ protocol.PacketNumber,
-					_ *handshake.TransportParameters,
 					_ protocol.VersionNumber,
 					_ utils.Logger,
 					_ protocol.VersionNumber,
diff --git a/session.go b/session.go
index 15e81bb5..a8a0b262 100644
--- a/session.go
+++ b/session.go
@@ -265,7 +265,6 @@ var newClientSession = func(
 	conf *Config,
 	tlsConf *tls.Config,
 	initialPacketNumber protocol.PacketNumber,
-	params *handshake.TransportParameters,
 	initialVersion protocol.VersionNumber,
 	logger utils.Logger,
 	v protocol.VersionNumber,
@@ -293,6 +292,19 @@ var newClientSession = func(
 	initialStream := newCryptoStream()
 	handshakeStream := newCryptoStream()
 	oneRTTStream := newPostHandshakeCryptoStream(s.framer)
+	params := &handshake.TransportParameters{
+		InitialMaxStreamDataBidiRemote: protocol.InitialMaxStreamData,
+		InitialMaxStreamDataBidiLocal:  protocol.InitialMaxStreamData,
+		InitialMaxStreamDataUni:        protocol.InitialMaxStreamData,
+		InitialMaxData:                 protocol.InitialMaxData,
+		IdleTimeout:                    s.config.IdleTimeout,
+		MaxBidiStreamNum:               protocol.StreamNum(s.config.MaxIncomingStreams),
+		MaxUniStreamNum:                protocol.StreamNum(s.config.MaxIncomingUniStreams),
+		MaxAckDelay:                    protocol.MaxAckDelayInclGranularity,
+		AckDelayExponent:               protocol.AckDelayExponent,
+		DisableMigration:               true,
+		ActiveConnectionIDLimit:        protocol.MaxActiveConnectionIDs,
+	}
 	cs, clientHelloWritten := handshake.NewCryptoSetupClient(
 		initialStream,
 		handshakeStream,
diff --git a/session_test.go b/session_test.go
index f442f5d3..76d2a04c 100644
--- a/session_test.go
+++ b/session_test.go
@@ -1546,7 +1546,6 @@ var _ = Describe("Client Session", func() {
 			quicConf,
 			tlsConf,
 			42, // initial packet number
-			&handshake.TransportParameters{},
 			protocol.VersionTLS,
 			utils.DefaultLogger,
 			protocol.VersionTLS,