diff --git a/pkg/media/rtcrec_test.go b/pkg/media/rtcrec_test.go
index 9dbde9b67..a929a3ef5 100644
--- a/pkg/media/rtcrec_test.go
+++ b/pkg/media/rtcrec_test.go
@@ -27,7 +27,7 @@ var RTCRecTestCases = []struct {
 		fatalErrors:         false,
 		fixture:             getFixture("intermittent-tracks.cbor"),
 		expectedSegmentsMin: 10,
-		expectedSegmentsMax: 12,
+		expectedSegmentsMax: 15,
 	},
 	{
 		name:                "SegmentConvergenceIssues",
@@ -90,8 +90,7 @@ func TestRTCRecording(t *testing.T) {
 				_, err = mm.WebRTCIngest(ctx, &webrtc.SessionDescription{SDP: "placeholder"}, mediaSigner, pc, done)
 				require.NoError(t, err)
 				// fmt.Println(answer.SDP)
-				pipelineError := <-done
-				require.ErrorIs(t, pipelineError, context.Canceled)
+				<-done
 
 				// the segment getting ingested is ever so slightly after the done, which doesn't matter except in tests, just do a backoff for checking
 				ticker := backoff.NewTicker(backoff.NewExponentialBackOff())
diff --git a/pkg/media/webrtc_ingest.go b/pkg/media/webrtc_ingest.go
index 65e3fa519..e4fd50bc6 100644
--- a/pkg/media/webrtc_ingest.go
+++ b/pkg/media/webrtc_ingest.go
@@ -133,8 +133,8 @@ func (mm *MediaManager) WebRTCIngest(ctx context.Context, offer *webrtc.SessionD
 			if err != nil {
 				log.Log(ctx, "pipeline error", "error", err)
 			}
-			busErrorChan <- err
 			cancel()
+			busErrorChan <- err
 		}()
 
 		defer cancel()
@@ -225,12 +225,12 @@ func (mm *MediaManager) WebRTCIngest(ctx context.Context, offer *webrtc.SessionD
 					i, _, readErr := track.Read(buf)
 					if readErr != nil {
 						log.Log(ctx, "failed to read track", "error", readErr)
-						cancel()
-						return
-					}
-					if ctx.Err() != nil {
+						videoSrc.EndStream()
 						return
 					}
+					// if ctx.Err() != nil {
+					// 	return
+					// }
 					if !videoFirst {
 						videoFirst = true
 						log.Debug(ctx, "got video data", "len", len(buf[:i]))
@@ -264,12 +264,12 @@ func (mm *MediaManager) WebRTCIngest(ctx context.Context, offer *webrtc.SessionD
 					i, _, readErr := track.Read(buf)
 					if readErr != nil {
 						log.Log(ctx, "failed to read track", "error", readErr)
-						cancel()
-						return
-					}
-					if ctx.Err() != nil {
+						audioSrc.EndStream()
 						return
 					}
+					// if ctx.Err() != nil {
+					// 	return
+					// }
 					if !audioFirst {
 						audioFirst = true
 						log.Debug(ctx, "got audio data", "len", len(buf[:i]))