diff --git a/retransmission_queue.go b/retransmission_queue.go
index 741a57a1..d29d3660 100644
--- a/retransmission_queue.go
+++ b/retransmission_queue.go
@@ -56,10 +56,15 @@ func (q *retransmissionQueue) AddAppData(f wire.Frame) {
 
 func (q *retransmissionQueue) GetInitialFrame(maxLen protocol.ByteCount) wire.Frame {
 	if len(q.initialCryptoData) > 0 {
-		if f := q.initialCryptoData[0]; f.Length(q.version) <= maxLen {
+		f := q.initialCryptoData[0]
+		newFrame, needsSplit := f.MaybeSplitOffFrame(maxLen, q.version)
+		if newFrame == nil && !needsSplit { // the whole frame fits
 			q.initialCryptoData = q.initialCryptoData[1:]
 			return f
 		}
+		if newFrame != nil { // frame was split. Leave the original frame in the queue.
+			return newFrame
+		}
 	}
 	if len(q.initial) == 0 {
 		return nil
@@ -74,10 +79,15 @@ func (q *retransmissionQueue) GetInitialFrame(maxLen protocol.ByteCount) wire.Fr
 
 func (q *retransmissionQueue) GetHandshakeFrame(maxLen protocol.ByteCount) wire.Frame {
 	if len(q.handshakeCryptoData) > 0 {
-		if f := q.handshakeCryptoData[0]; f.Length(q.version) <= maxLen {
+		f := q.handshakeCryptoData[0]
+		newFrame, needsSplit := f.MaybeSplitOffFrame(maxLen, q.version)
+		if newFrame == nil && !needsSplit { // the whole frame fits
 			q.handshakeCryptoData = q.handshakeCryptoData[1:]
 			return f
 		}
+		if newFrame != nil { // frame was split. Leave the original frame in the queue.
+			return newFrame
+		}
 	}
 	if len(q.handshake) == 0 {
 		return nil
diff --git a/retransmission_queue_test.go b/retransmission_queue_test.go
index 9bfafe18..c9e940f0 100644
--- a/retransmission_queue_test.go
+++ b/retransmission_queue_test.go
@@ -36,11 +36,43 @@ var _ = Describe("Retransmission queue", func() {
 			f := &wire.CryptoFrame{Data: []byte("foobar")}
 			q.AddInitial(f)
 			Expect(q.HasInitialData()).To(BeTrue())
-			Expect(q.GetInitialFrame(f.Length(version) - 1)).To(BeNil())
 			Expect(q.GetInitialFrame(f.Length(version))).To(Equal(f))
 			Expect(q.HasInitialData()).To(BeFalse())
 		})
 
+		It("returns split CRYPTO frames", func() {
+			f := &wire.CryptoFrame{
+				Offset: 100,
+				Data:   []byte("foobar"),
+			}
+			q.AddInitial(f)
+			Expect(q.HasInitialData()).To(BeTrue())
+			f1 := q.GetInitialFrame(f.Length(version) - 3)
+			Expect(f1).ToNot(BeNil())
+			Expect(f1).To(BeAssignableToTypeOf(&wire.CryptoFrame{}))
+			Expect(f1.(*wire.CryptoFrame).Data).To(Equal([]byte("foo")))
+			Expect(f1.(*wire.CryptoFrame).Offset).To(Equal(protocol.ByteCount(100)))
+			Expect(q.HasInitialData()).To(BeTrue())
+			f2 := q.GetInitialFrame(protocol.MaxByteCount)
+			Expect(f2).ToNot(BeNil())
+			Expect(f2).To(BeAssignableToTypeOf(&wire.CryptoFrame{}))
+			Expect(f2.(*wire.CryptoFrame).Data).To(Equal([]byte("bar")))
+			Expect(f2.(*wire.CryptoFrame).Offset).To(Equal(protocol.ByteCount(103)))
+			Expect(q.HasInitialData()).To(BeFalse())
+		})
+
+		It("returns other frames when a CRYPTO frame wouldn't fit", func() {
+			f := &wire.CryptoFrame{Data: []byte("foobar")}
+			q.AddInitial(f)
+			q.AddInitial(&wire.PingFrame{})
+			f1 := q.GetInitialFrame(2) // too small for a CRYPTO frame
+			Expect(f1).ToNot(BeNil())
+			Expect(f1).To(BeAssignableToTypeOf(&wire.PingFrame{}))
+			Expect(q.HasInitialData()).To(BeTrue())
+			f2 := q.GetInitialFrame(protocol.MaxByteCount)
+			Expect(f2).To(Equal(f))
+		})
+
 		It("retrieves both a CRYPTO frame and a control frame", func() {
 			cf := &wire.MaxDataFrame{ByteOffset: 0x42}
 			f := &wire.CryptoFrame{Data: []byte("foobar")}
@@ -80,11 +112,43 @@ var _ = Describe("Retransmission queue", func() {
 			f := &wire.CryptoFrame{Data: []byte("foobar")}
 			q.AddHandshake(f)
 			Expect(q.HasHandshakeData()).To(BeTrue())
-			Expect(q.GetHandshakeFrame(f.Length(version) - 1)).To(BeNil())
 			Expect(q.GetHandshakeFrame(f.Length(version))).To(Equal(f))
 			Expect(q.HasHandshakeData()).To(BeFalse())
 		})
 
+		It("returns split CRYPTO frames", func() {
+			f := &wire.CryptoFrame{
+				Offset: 100,
+				Data:   []byte("foobar"),
+			}
+			q.AddHandshake(f)
+			Expect(q.HasHandshakeData()).To(BeTrue())
+			f1 := q.GetHandshakeFrame(f.Length(version) - 3)
+			Expect(f1).ToNot(BeNil())
+			Expect(f1).To(BeAssignableToTypeOf(&wire.CryptoFrame{}))
+			Expect(f1.(*wire.CryptoFrame).Data).To(Equal([]byte("foo")))
+			Expect(f1.(*wire.CryptoFrame).Offset).To(Equal(protocol.ByteCount(100)))
+			Expect(q.HasHandshakeData()).To(BeTrue())
+			f2 := q.GetHandshakeFrame(protocol.MaxByteCount)
+			Expect(f2).ToNot(BeNil())
+			Expect(f2).To(BeAssignableToTypeOf(&wire.CryptoFrame{}))
+			Expect(f2.(*wire.CryptoFrame).Data).To(Equal([]byte("bar")))
+			Expect(f2.(*wire.CryptoFrame).Offset).To(Equal(protocol.ByteCount(103)))
+			Expect(q.HasHandshakeData()).To(BeFalse())
+		})
+
+		It("returns other frames when a CRYPTO frame wouldn't fit", func() {
+			f := &wire.CryptoFrame{Data: []byte("foobar")}
+			q.AddHandshake(f)
+			q.AddHandshake(&wire.PingFrame{})
+			f1 := q.GetHandshakeFrame(2) // too small for a CRYPTO frame
+			Expect(f1).ToNot(BeNil())
+			Expect(f1).To(BeAssignableToTypeOf(&wire.PingFrame{}))
+			Expect(q.HasHandshakeData()).To(BeTrue())
+			f2 := q.GetHandshakeFrame(protocol.MaxByteCount)
+			Expect(f2).To(Equal(f))
+		})
+
 		It("retrieves both a CRYPTO frame and a control frame", func() {
 			cf := &wire.MaxDataFrame{ByteOffset: 0x42}
 			f := &wire.CryptoFrame{Data: []byte("foobar")}
@@ -96,7 +160,7 @@ var _ = Describe("Retransmission queue", func() {
 			Expect(q.HasHandshakeData()).To(BeFalse())
 		})
 
-		It("drops all Initial frames", func() {
+		It("drops all Handshake frames", func() {
 			q.AddHandshake(&wire.CryptoFrame{Data: []byte("foobar")})
 			q.AddHandshake(&wire.MaxDataFrame{ByteOffset: 0x42})
 			q.DropPackets(protocol.EncryptionHandshake)