diff --git a/pkg/sfu/buffer/buffer.go b/pkg/sfu/buffer/buffer.go
index 5f62ef42a..dc45bb0d6 100644
--- a/pkg/sfu/buffer/buffer.go
+++ b/pkg/sfu/buffer/buffer.go
@@ -311,6 +311,11 @@ func (b *Buffer) getOnClose() func() {
 
 func (b *Buffer) sendPLI() {
 	ssrc := b.BufferBase.SSRC()
+	if ssrc == 0 {
+		return
+	}
+
+	b.logger.Debugw("send pli", "mediaSSRC", ssrc)
 	pli := []rtcp.Packet{
 		&rtcp.PictureLossIndication{
 			SenderSSRC: ssrc,
diff --git a/pkg/sfu/buffer/buffer_base.go b/pkg/sfu/buffer/buffer_base.go
index 071ed3797..2d5b1b1b4 100644
--- a/pkg/sfu/buffer/buffer_base.go
+++ b/pkg/sfu/buffer/buffer_base.go
@@ -1411,7 +1411,7 @@ func (b *BufferBase) seedKeyFrame(keyFrameSeederGeneration int32) {
 	//
 	// send gratuitous PLIs for some time or until a key frame is seen to
 	// get the engine rolling
-	b.logger.Debugw("starting key frame seeder")
+	b.logger.Debugw("starting key frame seeder", "generattion", keyFrameSeederGeneration)
 	timer := time.NewTimer(30 * time.Second)
 	defer timer.Stop()
 
@@ -1423,20 +1423,24 @@ func (b *BufferBase) seedKeyFrame(keyFrameSeederGeneration int32) {
 	rtpStats := b.rtpStats
 	b.RUnlock()
 	if rtpStats == nil {
-		b.logger.Debugw("cannot do key frame seeding without stats")
+		b.logger.Debugw("cannot do key frame seeding without stats", "generation", keyFrameSeederGeneration)
 		return
 	}
 	initialCount, _ = rtpStats.KeyFrame()
 
 	for {
 		if b.isClosed.Load() || b.keyFrameSeederGeneration.Load() != keyFrameSeederGeneration {
-			b.logger.Debugw("stopping key frame seeder: stopped")
+			b.logger.Debugw(
+				"stopping key frame seeder: stopped",
+				"generation", keyFrameSeederGeneration,
+				"currentGeneration", b.keyFrameSeederGeneration.Load(),
+			)
 			return
 		}
 
 		select {
 		case <-timer.C:
-			b.logger.Debugw("stopping key frame seeder: timeout")
+			b.logger.Debugw("stopping key frame seeder: timeout", "generation", keyFrameSeederGeneration)
 			return
 
 		case <-ticker.C:
@@ -1444,6 +1448,7 @@ func (b *BufferBase) seedKeyFrame(keyFrameSeederGeneration int32) {
 			if cnt > initialCount {
 				b.logger.Debugw(
 					"stopping key frame seeder: received key frame",
+					"generation", keyFrameSeederGeneration,
 					"keyFrameCountInitial", initialCount,
 					"keyFrameCount", cnt,
 					"lastKeyFrame", last,
diff --git a/pkg/sfu/receiver_base.go b/pkg/sfu/receiver_base.go
index 355c6a00a..b59c50141 100644
--- a/pkg/sfu/receiver_base.go
+++ b/pkg/sfu/receiver_base.go
@@ -603,7 +603,7 @@ func (r *ReceiverBase) getBufferLocked(layer int32) buffer.BufferProvider {
 
 func (r *ReceiverBase) GetOrCreateBuffer(
 	layer int32,
-	creatorFn func() (buffer.BufferProvider, error),
+	creatorFn func(*livekit.TrackInfo) (buffer.BufferProvider, error),
 ) (buffer.BufferProvider, bool) {
 	r.bufferMu.Lock()
 
@@ -617,13 +617,14 @@ func (r *ReceiverBase) GetOrCreateBuffer(
 		return buff, false
 	}
 
-	buff, err := creatorFn()
+	buff, err := creatorFn(r.trackInfo)
 	if err != nil {
 		r.bufferMu.Unlock()
 		r.params.Logger.Errorw("could not create buffer", err)
 		return nil, false
 	}
 
+	r.buffers[layer] = buff
 	rtt := r.rtt
 	r.bufferMu.Unlock()
 
@@ -1017,7 +1018,7 @@ func (r *ReceiverBase) SetCodecState(state ReceiverCodecState) {
 func (r *ReceiverBase) SetCodecWithState(codec webrtc.RTPCodecParameters, headerExtensions []webrtc.RTPHeaderExtensionParameter, codecState ReceiverCodecState) {
 	r.checkCodecChanged(codec, headerExtensions)
 
-	r.codecStateLock.Unlock()
+	r.codecStateLock.Lock()
 	if codecState == r.codecState {
 		r.codecStateLock.Unlock()
 		return