diff --git a/plugins/homekit/package-lock.json b/plugins/homekit/package-lock.json
index 22737ee6a..f14426dcd 100644
--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.64",
+   "version": "1.2.65",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/homekit",
-         "version": "1.2.64",
+         "version": "1.2.65",
          "dependencies": {
             "@koush/werift-src": "file:../../external/werift",
             "check-disk-space": "^3.4.0",
diff --git a/plugins/homekit/package.json b/plugins/homekit/package.json
index 30f49d896..349c52380 100644
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.64",
+   "version": "1.2.65",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
diff --git a/plugins/homekit/src/types/camera/camera-recording.ts b/plugins/homekit/src/types/camera/camera-recording.ts
index fbe011002..ea814839f 100644
--- a/plugins/homekit/src/types/camera/camera-recording.ts
+++ b/plugins/homekit/src/types/camera/camera-recording.ts
@@ -141,10 +141,6 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
         container: 'mp4',
     });
     const ffmpegInput = JSON.parse((await mediaManager.convertMediaObjectToBuffer(media, ScryptedMimeTypes.FFmpegInput)).toString()) as FFmpegInput;
-    if (!ffmpegInput.mediaStreamOptions?.prebuffer) {
-        log.a(`${device.name} is not prebuffered. Please install and enable the Rebroadcast plugin.`);
-    }
-
     const noAudio = ffmpegInput.mediaStreamOptions && ffmpegInput.mediaStreamOptions.audio === null;
     const audioCodec = ffmpegInput.mediaStreamOptions?.audio?.codec;
     const videoCodec = ffmpegInput.mediaStreamOptions?.video?.codec;
diff --git a/plugins/prebuffer-mixin/package-lock.json b/plugins/prebuffer-mixin/package-lock.json
index dc7ec7fe6..14c4ea61a 100644
--- a/plugins/prebuffer-mixin/package-lock.json
+++ b/plugins/prebuffer-mixin/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.10.55",
+   "version": "0.10.56",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/prebuffer-mixin",
-         "version": "0.10.55",
+         "version": "0.10.56",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",
diff --git a/plugins/prebuffer-mixin/package.json b/plugins/prebuffer-mixin/package.json
index c50b51d10..dfe717cf2 100644
--- a/plugins/prebuffer-mixin/package.json
+++ b/plugins/prebuffer-mixin/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.10.55",
+   "version": "0.10.56",
    "description": "Video Stream Rebroadcast, Prebuffer, and Management Plugin for Scrypted.",
    "author": "Scrypted",
    "license": "Apache-2.0",
diff --git a/plugins/prebuffer-mixin/src/main.ts b/plugins/prebuffer-mixin/src/main.ts
index d498f9507..640eadbbc 100644
--- a/plugins/prebuffer-mixin/src/main.ts
+++ b/plugins/prebuffer-mixin/src/main.ts
@@ -1124,8 +1124,7 @@ class PrebufferSession {
       session,
       filter,
     });
-
-    mediaStreamOptions.prebuffer = requestedPrebuffer;
+    mediaStreamOptions.prebuffer = 0;
 
     if (audioSection) {
       mediaStreamOptions.audio ||= {};
@@ -1145,6 +1144,8 @@ class PrebufferSession {
     for (const prebuffer of prebufferContainer) {
       if (prebuffer.time < now - requestedPrebuffer)
         continue;
+      if (!mediaStreamOptions.prebuffer)
+        mediaStreamOptions.prebuffer = now - prebuffer.time;
       for (const chunk of prebuffer.chunks) {
         available += chunk.length;
       }