diff --git a/src/components/live/providers/go2rtc/video-rtc.js b/src/components/live/providers/go2rtc/video-rtc.js
index 6b3a55a9..ac0a4ca7 100644
--- a/src/components/live/providers/go2rtc/video-rtc.js
+++ b/src/components/live/providers/go2rtc/video-rtc.js
@@ -390,8 +390,8 @@ export class VideoRTC extends HTMLElement {
 
     this.ws = new WebSocket(this.wsURL);
     this.ws.binaryType = 'arraybuffer';
-    this.ws.addEventListener('open', (ev) => this.onopen(ev));
-    this.ws.addEventListener('close', (ev) => this.onclose(ev));
+    this.ws.addEventListener('open', () => this.onopen());
+    this.ws.addEventListener('close', () => this.onclose());
 
     return true;
   }
@@ -543,24 +543,30 @@ export class VideoRTC extends HTMLElement {
       const sb = ms.addSourceBuffer(msg.value);
       sb.mode = 'segments'; // segments or sequence
       sb.addEventListener('updateend', () => {
-        if (sb.updating) return;
-
-        try {
-          if (bufLen > 0) {
+        if (!sb.updating && bufLen > 0) {
+          try {
             const data = buf.slice(0, bufLen);
-            bufLen = 0;
             sb.appendBuffer(data);
-          } else if (sb.buffered && sb.buffered.length) {
-            const end = sb.buffered.end(sb.buffered.length - 1) - 15;
-            const start = sb.buffered.start(0);
-            if (end > start) {
-              sb.remove(start, end);
-              ms.setLiveSeekableRange(end, end + 15);
-            }
-            // console.debug("VideoRTC.buffered", start, end);
+            bufLen = 0;
+          } catch (e) {
+            // console.debug(e);
           }
-        } catch (e) {
-          // console.debug(e);
+        }
+
+        if (!sb.updating && sb.buffered && sb.buffered.length) {
+          const end = sb.buffered.end(sb.buffered.length - 1);
+          const start = end - 5;
+          const start0 = sb.buffered.start(0);
+          if (start > start0) {
+            sb.remove(start0, start);
+            ms.setLiveSeekableRange(start, end);
+          }
+          if (this.video.currentTime < start) {
+            this.video.currentTime = start;
+          }
+          const gap = end - this.video.currentTime;
+          this.video.playbackRate = gap > 0.1 ? gap : 0.1;
+          // console.debug('VideoRTC.buffered', gap, this.video.playbackRate, this.video.readyState);
         }
       });