diff --git a/src/media-source.ts b/src/media-source.ts
index 4941d96..7b5c86d 100644
--- a/src/media-source.ts
+++ b/src/media-source.ts
@@ -418,7 +418,7 @@ export class CanvasSource extends VideoSource {
 
 		const frame = new VideoFrame(this._canvas, {
 			timestamp: Math.round(1e6 * timestamp),
-			duration: Math.round(1e6 * duration),
+			duration: Math.round(1e6 * duration) || undefined, // Drag 0 duration to undefined, glitches some codecs
 			alpha: 'discard',
 		});
 
diff --git a/src/misc.ts b/src/misc.ts
index 623cfb6..0f321b6 100644
--- a/src/misc.ts
+++ b/src/misc.ts
@@ -380,8 +380,8 @@ export const setVideoFrameTiming = (frame: VideoFrame, timing: {
 	duration?: number;
 }) => {
 	const clone = new VideoFrame(frame, {
-		timestamp: timing.timestamp && 1e6 * timing.timestamp,
-		duration: timing.duration && 1e6 * timing.duration,
+		timestamp: timing.timestamp !== undefined ? 1e6 * timing.timestamp : undefined,
+		duration: timing.duration !== undefined ? 1e6 * timing.duration : undefined,
 	});
 	frame.close();