diff --git a/media/src/io/sample_builder/mod.rs b/media/src/io/sample_builder/mod.rs
index ff1869d70..e009a3e28 100644
--- a/media/src/io/sample_builder/mod.rs
+++ b/media/src/io/sample_builder/mod.rs
@@ -111,7 +111,7 @@ impl<T: Depacketizer> SampleBuilder<T> {
             return false;
         }
 
-        found_tail.unwrap() - found_head.unwrap() > self.max_late_timestamp
+        found_tail.unwrap().wrapping_sub(found_head.unwrap()) > self.max_late_timestamp
     }
 
     /// Returns the timestamp associated with a given sample location
@@ -341,7 +341,7 @@ impl<T: Depacketizer> SampleBuilder<T> {
             data.extend_from_slice(&p);
             i = i.wrapping_add(1);
         }
-        let samples = after_timestamp - sample_timestamp;
+        let samples = after_timestamp.wrapping_sub(sample_timestamp);
 
         let sample = Sample {
             data: Bytes::copy_from_slice(&data),
diff --git a/media/src/io/sample_builder/sample_builder_test.rs b/media/src/io/sample_builder/sample_builder_test.rs
index 097a82d6d..7a3c3cdf3 100644
--- a/media/src/io/sample_builder/sample_builder_test.rs
+++ b/media/src/io/sample_builder/sample_builder_test.rs
@@ -1473,6 +1473,79 @@ fn test_pop_with_timestamp() {
     assert_eq!(s.pop_with_timestamp(), None);
 }
 
+#[test]
+fn test_too_old_timestamp_wrapping() {
+    // Create a SampleBuilder with 1ms max late duration (sample rate 48000 = 48 samples per 1ms)
+    let mut s = SampleBuilder::new(10, FakeDepacketizer::new(), 48000)
+        .with_max_time_delay(Duration::from_millis(1));
+
+    // Push packet with very high timestamp that would wrap around
+    s.push(Packet {
+        header: Header {
+            sequence_number: 1,
+            timestamp: u32::MAX - 10, // Very high timestamp
+            marker: false,
+            ..Default::default()
+        },
+        payload: bytes!(0x01),
+    });
+
+    // Push packet with wrapped timestamp, too_old will say true and we would get a sample with above packet
+    s.push(Packet {
+        header: Header {
+            sequence_number: 2,
+            timestamp: 38, // Very low timestamp but the ts diff will be > 48
+            marker: false,
+            ..Default::default()
+        },
+        payload: bytes!(0x02),
+    });
+
+    // This test would panic with "attempt to subtract with overflow" if wrapping_sub wasn't used
+    // The difference between timestamps should wrap around properly
+    assert!(
+        s.prepared.count() > 0, // due to ts diff 49 > 48 it will say that an old sample is done
+        "Expected packets to be considered too old event with timestamp wrapping"
+    );
+}
+
+#[test]
+fn test_too_old_ok_timestamp_wrapping() {
+    // Create a SampleBuilder with 1ms max late duration (sample rate 48000 = 48 samples per 1ms)
+    let mut s = SampleBuilder::new(10, FakeDepacketizer::new(), 48000)
+        .with_max_time_delay(Duration::from_millis(1));
+
+    // Push packet with very high timestamp that would wrap around
+    s.push(Packet {
+        header: Header {
+            sequence_number: 1,
+            timestamp: u32::MAX - 10, // Very high timestamp
+            marker: false,
+            ..Default::default()
+        },
+        payload: bytes!(0x01),
+    });
+
+    // Push packet with low timestamp
+    s.push(Packet {
+        header: Header {
+            sequence_number: 2,
+            timestamp: 10, // Very low timestamp
+            marker: false,
+            ..Default::default()
+        },
+        payload: bytes!(0x02),
+    });
+
+    // This test would panic with "attempt to subtract with overflow" if wrapping_sub wasn't used
+    // The difference between timestamps should wrap around properly
+    assert!(
+        !s.too_old(&s.filled), // 21 < 48
+        "Expected packets to not be considered too old even with timestamp wrapping"
+    );
+    assert!(s.prepared.empty());
+}
+
 #[test]
 fn test_sample_builder_data() {
     let mut s = SampleBuilder::new(10, FakeDepacketizer::new(), 1);