diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
index 34a13ab6c..a9c8a5aa7 100644
--- a/.github/workflows/buildtest.yaml
+++ b/.github/workflows/buildtest.yaml
@@ -17,9 +17,9 @@ name: Test
 on:
   workflow_dispatch:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
       - name: Set up gotestfmt
         run: go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.4.1
diff --git a/pkg/sfu/buffer/rtpstats_receiver.go b/pkg/sfu/buffer/rtpstats_receiver.go
index 6fa9969af..bd1b16341 100644
--- a/pkg/sfu/buffer/rtpstats_receiver.go
+++ b/pkg/sfu/buffer/rtpstats_receiver.go
@@ -56,6 +56,9 @@ const (
 	cPropagationDelayDeltaHighResetNumReports         = 2
 	cPropagationDelayDeltaHighResetWait               = 10 * time.Second
 	cPropagationDelayDeltaLongTermAdaptationThreshold = 50 * time.Millisecond
+
+	// number of seconds the current report RTP timestamp can be off from expected RTP timestamp
+	cReportSlack = float64(60.0)
 )
 
 type RTPFlowState struct {
@@ -295,14 +298,38 @@ func (r *RTPStatsReceiver) SetRtcpSenderReportData(srData *RTCPSenderReportData)
 
 	tsCycles := uint64(0)
 	if r.srNewest != nil {
-		tsCycles = r.srNewest.RTPTimestampExt & 0xFFFF_FFFF_0000_0000
-		if (srData.RTPTimestamp-r.srNewest.RTPTimestamp) < (1<<31) && srData.RTPTimestamp < r.srNewest.RTPTimestamp {
-			tsCycles += (1 << 32)
-		}
+		// use time since last sender report to ensure long gaps where the time stamp might
+		// jump more than half the range
+		timeSinceLastReport := srData.NTPTimestamp.Time().Sub(r.srNewest.NTPTimestamp.Time())
+		expectedRTPTimestampExt := r.srNewest.RTPTimestampExt + uint64(timeSinceLastReport.Nanoseconds()*int64(r.params.ClockRate)/1e9)
+		lbound := expectedRTPTimestampExt - uint64(cReportSlack*float64(r.params.ClockRate))
+		ubound := expectedRTPTimestampExt + uint64(cReportSlack*float64(r.params.ClockRate))
+		isInRange := (srData.RTPTimestamp-uint32(lbound) < (1 << 31)) && (uint32(ubound)-srData.RTPTimestamp < (1 << 31))
+		if isInRange {
+			lbTSCycles := lbound & 0xFFFF_FFFF_0000_0000
+			ubTSCycles := ubound & 0xFFFF_FFFF_0000_0000
+			if lbTSCycles == ubTSCycles {
+				tsCycles = lbTSCycles
+			} else {
+				if srData.RTPTimestamp < (1 << 31) {
+					// rolled over
+					tsCycles = ubTSCycles
+				} else {
+					tsCycles = lbTSCycles
+				}
+			}
+		} else {
+			// ideally this method should not be required, but there are clients
+			// negotiating one clock rate, but actually send media at a different rate.
+			tsCycles = r.srNewest.RTPTimestampExt & 0xFFFF_FFFF_0000_0000
+			if (srData.RTPTimestamp-r.srNewest.RTPTimestamp) < (1<<31) && srData.RTPTimestamp < r.srNewest.RTPTimestamp {
+				tsCycles += (1 << 32)
+			}
 
-		if tsCycles >= (1 << 32) {
-			if (srData.RTPTimestamp-r.srNewest.RTPTimestamp) >= (1<<31) && srData.RTPTimestamp > r.srNewest.RTPTimestamp {
-				tsCycles -= (1 << 32)
+			if tsCycles >= (1 << 32) {
+				if (srData.RTPTimestamp-r.srNewest.RTPTimestamp) >= (1<<31) && srData.RTPTimestamp > r.srNewest.RTPTimestamp {
+					tsCycles -= (1 << 32)
+				}
 			}
 		}
 	}