diff --git a/plugins/homekit/package-lock.json b/plugins/homekit/package-lock.json
index ef91af7f56..97132aa2de 100644
--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.50",
+   "version": "1.2.51",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/homekit",
-         "version": "1.2.50",
+         "version": "1.2.51",
          "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 af2acd4698..527eb7057c 100644
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.50",
+   "version": "1.2.51",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
diff --git a/plugins/homekit/src/main.ts b/plugins/homekit/src/main.ts
index 8a906f1211..c70f29a955 100644
--- a/plugins/homekit/src/main.ts
+++ b/plugins/homekit/src/main.ts
@@ -269,7 +269,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
                     storageSettings.settings.pincode.persistedDefaultValue = randomPinCode();
                     // TODO: change this value after this current default has been persisted to existing clients.
                     // changing it now will cause existing accessories be renamed.
-                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = true;
+                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = false;
 
                     const mixinConsole = deviceManager.getMixinConsole(device.id, this.nativeId);
 
diff --git a/plugins/homekit/src/types/camera.ts b/plugins/homekit/src/types/camera.ts
index 908b555546..8209945b55 100644
--- a/plugins/homekit/src/types/camera.ts
+++ b/plugins/homekit/src/types/camera.ts
@@ -103,7 +103,7 @@ addSupportedType({
         const isRecordingEnabled = device.interfaces.includes(ScryptedInterface.MotionSensor);
 
         let configuration: CameraRecordingConfiguration;
-        const openRecordingStreams = new Map<number, AsyncGenerator<RecordingPacket>>();
+        const openRecordingStreams = new Set<number>();
         if (isRecordingEnabled) {
             recordingDelegate = {
                 updateRecordingConfiguration(newConfiguration: CameraRecordingConfiguration) {
@@ -112,12 +112,10 @@ addSupportedType({
                 handleRecordingStreamRequest(streamId: number): AsyncGenerator<RecordingPacket> {
                     const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin, 
                         () => openRecordingStreams.has(streamId));
-                    openRecordingStreams.set(streamId, ret);
+                    openRecordingStreams.add(streamId);
                     return ret;
                 },
                 closeRecordingStream(streamId, reason) {
-                    const r = openRecordingStreams.get(streamId);
-                    r?.throw(new Error(reason?.toString()));
                     openRecordingStreams.delete(streamId);
                 },
                 updateRecordingActive(active) {