diff --git a/custom_components/webrtc/www/video-rtc.js b/custom_components/webrtc/www/video-rtc.js
index f04a1bf7..fb872b45 100644
--- a/custom_components/webrtc/www/video-rtc.js
+++ b/custom_components/webrtc/www/video-rtc.js
@@ -164,9 +164,8 @@ export class VideoRTC extends HTMLElement {
      * https://developer.chrome.com/blog/autoplay/
      */
     play() {
-        this.video.play().catch(er => {
-            const isAutoplayError = er.name === 'NotAllowedError';
-            if (!this.video.muted && isAutoplayError) {
+        this.video.play().catch(() => {
+            if (!this.video.muted) {
                 this.video.muted = true;
                 this.video.play().catch(er => {
                     console.warn(er);
@@ -440,24 +439,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);
+                    }
+                }
+
+                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;
                     }
-                } catch (e) {
-                    // console.debug(e);
+                    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);
                 }
             });
 
@@ -469,7 +474,7 @@ export class VideoRTC extends HTMLElement {
                     const b = new Uint8Array(data);
                     buf.set(b, bufLen);
                     bufLen += b.byteLength;
-                    // console.debug("VideoRTC.buffer", b.byteLength, bufLen);
+                    // console.debug('VideoRTC.buffer', b.byteLength, bufLen);
                 } else {
                     try {
                         sb.appendBuffer(data);
diff --git a/custom_components/webrtc/www/webrtc-camera.js b/custom_components/webrtc/www/webrtc-camera.js
index d1fc550f..6f2d6597 100644
--- a/custom_components/webrtc/www/webrtc-camera.js
+++ b/custom_components/webrtc/www/webrtc-camera.js
@@ -1,5 +1,5 @@
 /** Chrome 63+, Safari 11.1+ */
-import {VideoRTC} from './video-rtc.js?v=1.9.4';
+import {VideoRTC} from './video-rtc.js?v=1.9.9';
 import {DigitalPTZ} from './digital-ptz.js?v=3.3.0';
 
 class WebRTCCamera extends VideoRTC {