diff --git a/.gitmodules b/.gitmodules
index 62ede5fcb7..a61cb4ecce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "plugins/homekit/HAP-NodeJS"]
-	path = external/HAP-NodeJS
-	url = ../../koush/HAP-NodeJS
 [submodule "plugins/unifi-protect/src/unifi-protect"]
 	path = external/unifi-protect
 	url = ../../koush/unifi-protect.git
diff --git a/external/HAP-NodeJS b/external/HAP-NodeJS
deleted file mode 160000
index 3fe1f920f5..0000000000
--- a/external/HAP-NodeJS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3fe1f920f5a6b63200b8a4bf951fe7efa0ccb566
diff --git a/plugins/homekit/package-lock.json b/plugins/homekit/package-lock.json
index b815abfdc8..7ff67ec36d 100644
--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.16",
+   "version": "1.2.17",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/homekit",
-         "version": "1.2.16",
+         "version": "1.2.17",
          "dependencies": {
             "@koush/werift-src": "file:../../external/werift",
             "check-disk-space": "^3.3.1",
@@ -126,7 +126,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.2.84",
+         "version": "0.2.85",
          "dev": true,
          "license": "ISC",
          "dependencies": {
diff --git a/plugins/homekit/package.json b/plugins/homekit/package.json
index 22f4cd2d42..053930ae92 100644
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.16",
+   "version": "1.2.17",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
diff --git a/plugins/homekit/src/types/camera.ts b/plugins/homekit/src/types/camera.ts
index 8ee9b6b036..5f7776c824 100644
--- a/plugins/homekit/src/types/camera.ts
+++ b/plugins/homekit/src/types/camera.ts
@@ -98,12 +98,13 @@ addSupportedType({
         const detectAudio = storage.getItem('detectAudio') === 'true';
         const needAudioMotionService = device.interfaces.includes(ScryptedInterface.AudioSensor) && detectAudio;
         const linkedMotionSensor = storage.getItem('linkedMotionSensor');
+        const isRecordingEnabled = !!linkedMotionSensor || device.interfaces.includes(ScryptedInterface.MotionSensor) || needAudioMotionService
 
         const storageKeySelectedRecordingConfiguration = 'selectedRecordingConfiguration';
 
         let configuration: CameraRecordingConfiguration;
         const openRecordingStreams = new Map<number, Deferred<any>>();
-        if (linkedMotionSensor || device.interfaces.includes(ScryptedInterface.MotionSensor) || needAudioMotionService) {
+        if (isRecordingEnabled) {
             recordingDelegate = {
                 updateRecordingConfiguration(newConfiguration: CameraRecordingConfiguration ) {
                     configuration = newConfiguration;
@@ -193,12 +194,12 @@ addSupportedType({
             cameraStreamCount: 8,
             delegate,
             streamingOptions,
-            recording: {
+            recording: !isRecordingEnabled ? undefined : {
                 options: recordingOptions,
                 delegate: recordingDelegate,
             },
             sensors: {
-                motion: true,
+                motion: isRecordingEnabled,
             },
         });