diff --git a/go.mod b/go.mod
index 2b54b57af..4b9584ee5 100644
--- a/go.mod
+++ b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/jxskiss/base62 v1.1.0
 	github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
-	github.com/livekit/mediatransportutil v0.0.0-20240406063423-a67d961689df
+	github.com/livekit/mediatransportutil v0.0.0-20240416023643-881d3dc5423e
 	github.com/livekit/protocol v1.12.1-0.20240410060226-b6a979d8cfce
 	github.com/livekit/psrpc v0.5.3-0.20240327035954-cec3a0e614be
 	github.com/mackerelio/go-osstat v0.2.4
diff --git a/go.sum b/go.sum
index c105929f9..39191d6b6 100644
--- a/go.sum
+++ b/go.sum
@@ -132,8 +132,8 @@ github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw
 github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y=
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkDaKb5iXdynYrzB84ErPPO4LbRASk58=
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
-github.com/livekit/mediatransportutil v0.0.0-20240406063423-a67d961689df h1:DVhJRlF6/CtiyxJVy3QsbS9bf7GyUMuRZONMwZxIWpY=
-github.com/livekit/mediatransportutil v0.0.0-20240406063423-a67d961689df/go.mod h1:jwKUCmObuiEDH0iiuJHaGMXwRs3RjrB4G6qqgkr/5oE=
+github.com/livekit/mediatransportutil v0.0.0-20240416023643-881d3dc5423e h1:ss4VwrouYiDpuNJ9BUTH+WsW+GDdJS70iZp8ii3/0Lc=
+github.com/livekit/mediatransportutil v0.0.0-20240416023643-881d3dc5423e/go.mod h1:jwKUCmObuiEDH0iiuJHaGMXwRs3RjrB4G6qqgkr/5oE=
 github.com/livekit/protocol v1.12.1-0.20240410060226-b6a979d8cfce h1:cbuw8FQ5S1vX6avOmlj6f8IwliXsOGjOa3UR0YDucX8=
 github.com/livekit/protocol v1.12.1-0.20240410060226-b6a979d8cfce/go.mod h1:jB6PWwf4tdMAwy+jxexqaVWuQiiklAtO4F5zZzWkTII=
 github.com/livekit/psrpc v0.5.3-0.20240327035954-cec3a0e614be h1:W1nCFZ19rYAORMBNX82NeVPHjADN0UyORr6refbUXpU=
diff --git a/pkg/sfu/buffer/rtpstats_base.go b/pkg/sfu/buffer/rtpstats_base.go
index 83c667dab..04028465d 100644
--- a/pkg/sfu/buffer/rtpstats_base.go
+++ b/pkg/sfu/buffer/rtpstats_base.go
@@ -130,7 +130,8 @@ func (r *RTCPSenderReportData) ToString() string {
 		r.NTPTimestamp.Time().String(),
 		r.RTPTimestamp,
 		r.RTPTimestampExt,
-		r.At.String(), r.AtAdjusted.String(),
+		r.At.String(),
+		r.AtAdjusted.String(),
 	)
 }
 
@@ -879,8 +880,8 @@ func (r *rtpStatsBase) getDrift(extStartTS, extHighestTS uint64) (packetDrift *l
 		rtpClockTicks := r.srNewest.RTPTimestampExt - r.srFirst.RTPTimestampExt
 
 		elapsed := r.srNewest.NTPTimestamp.Time().Sub(r.srFirst.NTPTimestamp.Time())
-		driftSamples := int64(rtpClockTicks - uint64(elapsed.Nanoseconds()*int64(r.params.ClockRate)/1e9))
 		if elapsed.Seconds() > 0.0 {
+			driftSamples := int64(rtpClockTicks - uint64(elapsed.Nanoseconds()*int64(r.params.ClockRate)/1e9))
 			ntpReportDrift = &livekit.RTPDrift{
 				StartTime:      timestamppb.New(r.srFirst.NTPTimestamp.Time()),
 				EndTime:        timestamppb.New(r.srNewest.NTPTimestamp.Time()),
@@ -894,12 +895,12 @@ func (r *rtpStatsBase) getDrift(extStartTS, extHighestTS uint64) (packetDrift *l
 			}
 		}
 
-		elapsed = r.srNewest.At.Sub(r.srFirst.At)
-		driftSamples = int64(rtpClockTicks - uint64(elapsed.Nanoseconds()*int64(r.params.ClockRate)/1e9))
+		elapsed = r.srNewest.AtAdjusted.Sub(r.srFirst.AtAdjusted)
 		if elapsed.Seconds() > 0.0 {
+			driftSamples := int64(rtpClockTicks - uint64(elapsed.Nanoseconds()*int64(r.params.ClockRate)/1e9))
 			rebasedReportDrift = &livekit.RTPDrift{
-				StartTime:      timestamppb.New(r.srFirst.At),
-				EndTime:        timestamppb.New(r.srNewest.At),
+				StartTime:      timestamppb.New(r.srFirst.AtAdjusted),
+				EndTime:        timestamppb.New(r.srNewest.AtAdjusted),
 				Duration:       elapsed.Seconds(),
 				StartTimestamp: r.srFirst.RTPTimestampExt,
 				EndTimestamp:   r.srNewest.RTPTimestampExt,