diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml
index 6ff4ff1..7d7badc 100644
--- a/.github/workflows/lock-threads.yml
+++ b/.github/workflows/lock-threads.yml
@@ -2,7 +2,7 @@ name: 'Lock Threads'
 
 on:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: '30 0/6 * * *'
   workflow_dispatch:
 
 permissions:
diff --git a/LICENSE.md b/LICENSE.md
index a52f4a8..6bb241c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 Internet Systems Consortium License
 ===================================
 
-Copyright (c) `2017-2024`, `HJD https://github.com/hjdhjd`
+Copyright (c) `2017-2025`, `HJD https://github.com/hjdhjd`
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice
diff --git a/docs/Changelog.md b/docs/Changelog.md
index fb9a9f7..868f04e 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. This project uses [semantic versioning](https://semver.org/).
 
+## 7.11.0 (2025-01-05)
+  * Improvement: additional refinements to deal with more frequent Protect controller connectivity quirks.
+  * Housekeeping.
+
 ## 7.10.1 (2024-12-27)
   * Housekeeping.
 
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 5baf225..085fd03 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * eslint.config.mjs: Linting defaults for Homebridge plugins.
  */
diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
index dd4bd94..ac39217 100644
--- a/homebridge-ui/public/index.html
+++ b/homebridge-ui/public/index.html
@@ -182,7 +182,7 @@ <h5>Support</h5>
 </div>
 <script type="module">
 
-  /* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+  /* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
    *
    * Plugin webUI script loader.
    */
diff --git a/homebridge-ui/public/ui.mjs b/homebridge-ui/public/ui.mjs
index 8ecb7a6..a99cc9c 100644
--- a/homebridge-ui/public/ui.mjs
+++ b/homebridge-ui/public/ui.mjs
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * ui.mjs: Homebridge UniFi Protect webUI.
  */
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
index 2f4572c..7daa4de 100644
--- a/homebridge-ui/server.js
+++ b/homebridge-ui/server.js
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * server.js: homebridge-unifi-protect webUI server API.
  *
diff --git a/package-lock.json b/package-lock.json
index b7a7688..e2f7553 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,29 +1,29 @@
 {
   "name": "homebridge-unifi-protect",
-  "version": "7.10.1",
+  "version": "7.11.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebridge-unifi-protect",
-      "version": "7.10.1",
+      "version": "7.11.0",
       "license": "ISC",
       "dependencies": {
         "@homebridge/plugin-ui-utils": "2.0.0",
         "ffmpeg-for-homebridge": "^2.1.7",
-        "homebridge-plugin-utils": "^1.13.0",
-        "unifi-protect": "^4.19.0",
+        "homebridge-plugin-utils": "^1.14.0",
+        "unifi-protect": "^4.20.3",
         "ws": "8.18.0"
       },
       "devDependencies": {
         "@stylistic/eslint-plugin": "2.12.1",
-        "@types/node": "22.10.2",
+        "@types/node": "22.10.5",
         "@types/ws": "8.5.13",
         "eslint": "9.17.0",
         "homebridge": "1.8.4",
         "shx": "0.3.4",
         "typescript": "5.7.2",
-        "typescript-eslint": "8.18.2"
+        "typescript-eslint": "8.19.0"
       },
       "engines": {
         "homebridge": ">=1.8.0 || >=2.0.0",
@@ -494,9 +494,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
-      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
@@ -522,17 +522,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz",
-      "integrity": "sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz",
+      "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.18.2",
-        "@typescript-eslint/type-utils": "8.18.2",
-        "@typescript-eslint/utils": "8.18.2",
-        "@typescript-eslint/visitor-keys": "8.18.2",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/type-utils": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -552,16 +552,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.2.tgz",
-      "integrity": "sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz",
+      "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.2",
-        "@typescript-eslint/types": "8.18.2",
-        "@typescript-eslint/typescript-estree": "8.18.2",
-        "@typescript-eslint/visitor-keys": "8.18.2",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -577,14 +577,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.2.tgz",
-      "integrity": "sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
+      "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.2",
-        "@typescript-eslint/visitor-keys": "8.18.2"
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -595,14 +595,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.2.tgz",
-      "integrity": "sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz",
+      "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.18.2",
-        "@typescript-eslint/utils": "8.18.2",
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -619,9 +619,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.2.tgz",
-      "integrity": "sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -633,14 +633,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.2.tgz",
-      "integrity": "sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz",
+      "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.2",
-        "@typescript-eslint/visitor-keys": "8.18.2",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -660,16 +660,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.2.tgz",
-      "integrity": "sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz",
+      "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.18.2",
-        "@typescript-eslint/types": "8.18.2",
-        "@typescript-eslint/typescript-estree": "8.18.2"
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -684,13 +684,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.2.tgz",
-      "integrity": "sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz",
+      "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.2",
+        "@typescript-eslint/types": "8.19.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -865,9 +865,9 @@
       "license": "MIT"
     },
     "node_modules/bl": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.16.tgz",
-      "integrity": "sha512-V/kz+z2Mx5/6qDfRCilmrukUXcXuCoXKg3/3hDvzKKoSUx8CJKudfIoT29XZc3UE9xBvxs5qictiHdprwtteEg==",
+      "version": "6.0.18",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.18.tgz",
+      "integrity": "sha512-2k76XmWCuvu9HTvu3tFOl5HDdCH0wLZ/jHYva/LBVJmc9oX8yUtNQjxrFmbTdXsCSmIxwVTANZPNDfMQrvHFUw==",
       "license": "MIT",
       "dependencies": {
         "@types/readable-stream": "^4.0.0",
@@ -2034,15 +2034,15 @@
       }
     },
     "node_modules/homebridge-plugin-utils": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/homebridge-plugin-utils/-/homebridge-plugin-utils-1.13.0.tgz",
-      "integrity": "sha512-uMbK0klMPG+PKK45L9HGtk+90yiva7i+HA/9jK2oofDdc2dGQQSN0BJsneLQZEUQBhJZTmx23q82jDewkfJYuw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/homebridge-plugin-utils/-/homebridge-plugin-utils-1.14.0.tgz",
+      "integrity": "sha512-JMm0ncFLa90iJEII40K3bhV4MgKTR5eYw+/4srcFLD5x9rs9INKy7X1O8WRFqvjooydD2hdtbj4y1kt6i5D0rQ==",
       "license": "ISC",
       "dependencies": {
         "mqtt": "5.10.3"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/http-cache-semantics": {
@@ -3769,15 +3769,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.18.2.tgz",
-      "integrity": "sha512-KuXezG6jHkvC3MvizeXgupZzaG5wjhU3yE8E7e6viOvAvD9xAWYp8/vy0WULTGe9DYDWcQu7aW03YIV3mSitrQ==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.0.tgz",
+      "integrity": "sha512-Ni8sUkVWYK4KAcTtPjQ/UTiRk6jcsuDhPpxULapUDi8A/l8TSBk+t1GtJA1RsCzIJg0q6+J7bf35AwQigENWRQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.18.2",
-        "@typescript-eslint/parser": "8.18.2",
-        "@typescript-eslint/utils": "8.18.2"
+        "@typescript-eslint/eslint-plugin": "8.19.0",
+        "@typescript-eslint/parser": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3798,9 +3798,9 @@
       "license": "MIT"
     },
     "node_modules/unifi-protect": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/unifi-protect/-/unifi-protect-4.19.0.tgz",
-      "integrity": "sha512-Rl1wzMwk3yDngFd3RYdS7nVc8Fd7Hqh2My93p1/YsO7gl6VXowcp7oiQUeFkTH0AZbKEjW1e1SE3vQA/e2gyCA==",
+      "version": "4.20.3",
+      "resolved": "https://registry.npmjs.org/unifi-protect/-/unifi-protect-4.20.3.tgz",
+      "integrity": "sha512-cFOGCyrRcngiYs/ojhb49+E1OYL6/MItG9RTgZRu74eMJtgVmPo7oRzclGxUsE4Hhu2CLzt2e8Rj+IU2UnpXDg==",
       "license": "ISC",
       "dependencies": {
         "@adobe/fetch": "4.1.11",
diff --git a/package.json b/package.json
index 3b98ae9..e392988 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-unifi-protect",
-  "version": "7.10.1",
+  "version": "7.11.0",
   "displayName": "Homebridge UniFi Protect",
   "description": "Homebridge UniFi Protect plugin providing complete HomeKit integration for the UniFi Protect ecosystem with full support for most features including autoconfiguration, motion detection, multiple controllers, and realtime updates.",
   "author": {
@@ -77,19 +77,19 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "2.0.0",
     "ffmpeg-for-homebridge": "^2.1.7",
-    "homebridge-plugin-utils": "^1.13.0",
-    "unifi-protect": "^4.19.0",
+    "homebridge-plugin-utils": "^1.14.0",
+    "unifi-protect": "^4.20.3",
     "ws": "8.18.0"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "2.12.1",
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/ws": "8.5.13",
     "eslint": "9.17.0",
     "homebridge": "1.8.4",
     "shx": "0.3.4",
     "typescript": "5.7.2",
-    "typescript-eslint": "8.18.2"
+    "typescript-eslint": "8.19.0"
   },
   "optionalDependencies": {
     "bufferutil": "4.0.9"
diff --git a/src/devices/index.ts b/src/devices/index.ts
index cd46454..3bd495a 100644
--- a/src/devices/index.ts
+++ b/src/devices/index.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * index.ts: Protect device classes.
  */
diff --git a/src/devices/protect-camera-package.ts b/src/devices/protect-camera-package.ts
index 345dbc3..ef58b1f 100644
--- a/src/devices/protect-camera-package.ts
+++ b/src/devices/protect-camera-package.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-camera-package.ts: Package camera device class for UniFi Protect.
  */
@@ -15,7 +15,7 @@ export class ProtectCameraPackage extends ProtectCamera {
   private flashlightTimer?: NodeJS.Timeout;
 
   // Configure the package camera.
-  protected async configureDevice(): Promise<boolean> {
+  protected configureDevice(): boolean {
 
     // Get our parent camera.
     const parentCamera = this.nvr.getDeviceById(this.ufp.id);
@@ -121,7 +121,7 @@ export class ProtectCameraPackage extends ProtectCamera {
     this.accessory.configureController(this.stream.controller);
 
     // We're done.
-    return Promise.resolve(true);
+    return true;
   }
 
   // Configure a light accessory to turn on or off the flashlight.
diff --git a/src/devices/protect-camera.ts b/src/devices/protect-camera.ts
index 45596eb..eafff77 100644
--- a/src/devices/protect-camera.ts
+++ b/src/devices/protect-camera.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-camera.ts: Camera device class for UniFi Protect.
  */
@@ -59,7 +59,7 @@ export class ProtectCamera extends ProtectDevice {
     this.ufp = device;
 
     this.configureHints();
-    void this.configureDevice();
+    this.configureDevice();
   }
 
   // Configure device-specific settings for this device.
@@ -102,7 +102,7 @@ export class ProtectCamera extends ProtectDevice {
   }
 
   // Configure a camera accessory for HomeKit.
-  protected async configureDevice(): Promise<boolean> {
+  protected configureDevice(): boolean {
 
     // Save our context for reference before we recreate it.
     const savedContext = this.accessory.context;
@@ -135,9 +135,6 @@ export class ProtectCamera extends ProtectDevice {
     // Configure MQTT services.
     this.configureMqtt();
 
-    // Configure the ambient light sensor.
-    await this.configureAmbientLightSensor();
-
     // Configure the motion sensor.
     this.configureMotionSensor(!this.ufp.isThirdPartyCamera);
 
@@ -154,27 +151,34 @@ export class ProtectCamera extends ProtectDevice {
     this.configureHksv();
     this.configureHksvRecordingSwitch();
 
-    // Configure our video stream.
-    await this.configureVideoStream();
+    // We use an IIFE here since we can't make the enclosing function asynchronous.
+    (async (): Promise<void> => {
+
+      // Configure the ambient light sensor.
+      await this.configureAmbientLightSensor();
 
-    // Configure our camera details.
-    this.configureCameraDetails();
+      // Configure our video stream.
+      await this.configureVideoStream();
 
-    // Configure our NVR recording switches.
-    this.configureNvrRecordingSwitch();
+      // Configure our camera details.
+      this.configureCameraDetails();
 
-    // Configure the status indicator light switch.
-    this.configureStatusLedSwitch();
+      // Configure our NVR recording switches.
+      this.configureNvrRecordingSwitch();
 
-    // Configure the night vision indicator light switch.
-    this.configureNightVisionDimmer();
+      // Configure the status indicator light switch.
+      this.configureStatusLedSwitch();
 
-    // Configure the doorbell trigger.
-    this.configureDoorbellTrigger();
+      // Configure the night vision indicator light switch.
+      this.configureNightVisionDimmer();
 
-    // Listen for events.
-    this.nvr.events.on("addEvent." + this.ufp.id, this.listeners["addEvent." + this.ufp.id] = this.addEventHandler.bind(this));
-    this.nvr.events.on("updateEvent." + this.ufp.id, this.listeners["updateEvent." + this.ufp.id] = this.eventHandler.bind(this));
+      // Configure the doorbell trigger.
+      this.configureDoorbellTrigger();
+
+      // Listen for events.
+      this.nvr.events.on("addEvent." + this.ufp.id, this.listeners["addEvent." + this.ufp.id] = this.addEventHandler.bind(this));
+      this.nvr.events.on("updateEvent." + this.ufp.id, this.listeners["updateEvent." + this.ufp.id] = this.eventHandler.bind(this));
+    })();
 
     return true;
   }
@@ -191,6 +195,12 @@ export class ProtectCamera extends ProtectDevice {
     // Cleanup our livestream manager.
     this.livestream.shutdown();
 
+    // Unregister our controller.
+    if(this.stream?.controller) {
+
+      this.accessory.removeController(this.stream.controller);
+    }
+
     super.cleanup();
 
     this.isDeleted = true;
@@ -705,20 +715,17 @@ export class ProtectCamera extends ProtectDevice {
     // Enable RTSP on the camera if needed and get the list of RTSP streams we have ultimately configured.
     this.ufp = await this.nvr.ufpApi.enableRtsp(this.ufp) ?? this.ufp;
 
-    // Figure out which camera channels are RTSP-enabled, and user-enabled.
-    let cameraChannels = this.ufp.channels.filter(x => x.isRtspEnabled);
+    // Figure out which camera channels are RTSP-enabled, and user-enabled. We also filter out any package camera entries. We deal with those independently elsewhere.
+    const cameraChannels = this.ufp.channels.filter(channel => channel.isRtspEnabled && (channel.name !== "Package Camera"));
 
     // Set the camera and shapshot URLs.
     const cameraUrl = "rtsps://" + (this.nvr.config.overrideAddress ?? this.ufp.connectionHost ?? this.nvr.ufp.host) + ":" + this.nvr.ufp.ports.rtsps.toString() + "/";
 
-    // Filter out any package camera entries. We deal with those independently in the package camera class.
-    cameraChannels = cameraChannels.filter(x => x.name !== "Package Camera");
-
     // No RTSP streams are available that meet our criteria - we're done.
     if(!cameraChannels.length) {
 
-      this.log.info("No RTSP streaming profiles have been configured for this camera. You can resolve this issue by either enabling at least one RTSP profile in the " +
-        "UniFi Protect webUI or assigning an admin role to the local Protect user account you configured for this plugin.");
+      this.log.info("No RTSP profiles found for this camera. " +
+        "Enable at least one RTSP profile in the UniFi Protect webUI or assign an admin role to the local Protect user you configured for use with this plugin.");
 
       return false;
     }
diff --git a/src/devices/protect-chime.ts b/src/devices/protect-chime.ts
index a788c80..e88edb5 100644
--- a/src/devices/protect-chime.ts
+++ b/src/devices/protect-chime.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2023-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2023-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-chime.ts: Chime device class for UniFi Protect.
  */
diff --git a/src/devices/protect-device.ts b/src/devices/protect-device.ts
index 65ea06f..d534b0c 100644
--- a/src/devices/protect-device.ts
+++ b/src/devices/protect-device.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-device.ts: Base class for all UniFi Protect devices.
  */
diff --git a/src/devices/protect-doorbell.ts b/src/devices/protect-doorbell.ts
index 8642ceb..aeea308 100644
--- a/src/devices/protect-doorbell.ts
+++ b/src/devices/protect-doorbell.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-doorbell.ts: Doorbell device class for UniFi Protect.
  */
@@ -10,7 +10,6 @@ import { ProtectCameraConfig, ProtectCameraConfigPayload, ProtectCameraLcdMessag
 import { ProtectReservedNames, toCamelCase } from "../protect-types.js";
 import { ProtectCamera } from "./protect-camera.js";
 import { ProtectCameraPackage } from "./protect-camera-package.js";
-import { ProtectNvr } from "../protect-nvr.js";
 
 // A doorbell message entry.
 interface MessageInterface {
@@ -29,24 +28,23 @@ interface MessageSwitchInterface extends MessageInterface {
 
 export class ProtectDoorbell extends ProtectCamera {
 
-  private chimeDigitalDuration: number;
+  private chimeDigitalDuration!: number;
   private contactAuthTimer?: NodeJS.Timeout;
-  private defaultMessageDuration: number;
-  private isMessagesEnabled: boolean;
-  private isMessagesFromControllerEnabled: boolean;
-  private messageSwitches: { [index: string]: MessageSwitchInterface };
+  private defaultMessageDuration!: number;
+  private isMessagesEnabled!: boolean;
+  private isMessagesFromControllerEnabled!: boolean;
+  private messageSwitches!: { [index: string]: MessageSwitchInterface };
   public packageCamera?: Nullable<ProtectCameraPackage>;
 
-  // Create an instance.
-  constructor(nvr: ProtectNvr, device: ProtectCameraConfig, accessory: PlatformAccessory) {
-
-    super(nvr, device, accessory);
+  // Configure the doorbell for HomeKit.
+  protected configureDevice(): boolean {
 
     this.chimeDigitalDuration = this.getFeatureNumber("Doorbell.PhysicalChime.Duration.Digital") ?? PROTECT_DOORBELL_CHIME_DURATION_DIGITAL;
     this.defaultMessageDuration = this.nvr.ufp.doorbellSettings?.defaultMessageResetTimeoutMs ?? 60000;
     this.isMessagesEnabled = this.hasFeature("Doorbell.Messages");
     this.isMessagesFromControllerEnabled = this.hasFeature("Doorbell.Messages.FromDoorbell");
     this.messageSwitches = {};
+    this.packageCamera = null;
 
     // Ensure physical chimes that are digital have sane durations.
     if(this.chimeDigitalDuration < 1000) {
@@ -56,12 +54,6 @@ export class ProtectDoorbell extends ProtectCamera {
 
       this.chimeDigitalDuration = 10000;
     }
-  }
-
-  // Configure the doorbell for HomeKit.
-  protected async configureDevice(): Promise<boolean> {
-
-    this.packageCamera = null;
 
     // We only want to deal with actual Protect doorbell devices.
     if(!this.ufp.featureFlags.isDoorbell) {
@@ -70,7 +62,7 @@ export class ProtectDoorbell extends ProtectCamera {
     }
 
     // Call our parent to setup the camera portion of the doorbell.
-    await super.configureDevice();
+    super.configureDevice();
 
     // Configure our package camera, if we have one.
     this.configurePackageCamera();
@@ -97,6 +89,18 @@ export class ProtectDoorbell extends ProtectCamera {
     return true;
   }
 
+  // Cleanup after ourselves if we're being deleted.
+  public cleanup(): void {
+
+    if(this.packageCamera) {
+
+      this.packageCamera.cleanup();
+      this.packageCamera = null;
+    }
+
+    super.cleanup();
+  }
+
   // Configure our access to the doorbell LCD screen.
   private configureDoorbellLcdSwitch(): boolean {
 
@@ -210,9 +214,17 @@ export class ProtectDoorbell extends ProtectCamera {
         return false;
       }
 
-      // Register this accessory with homebridge and add it to the platform accessory array so we can track it.
-      this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [ packageCameraAccessory ]);
+      // Register this accessory with homebridge and add it to the accessory array so we can track it.
+      if(this.hasFeature("Device.Standalone")) {
+
+        this.api.publishExternalAccessories(PLUGIN_NAME, [ packageCameraAccessory ]);
+      } else {
+
+        this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [ packageCameraAccessory ]);
+      }
+
       this.platform.accessories.push(packageCameraAccessory);
+      this.api.updatePlatformAccessories(this.platform.accessories);
     }
 
     // Now create the package camera accessory. We do want to modify the camera name to ensure things look pretty.
diff --git a/src/devices/protect-light.ts b/src/devices/protect-light.ts
index 2a657a6..2aca92b 100644
--- a/src/devices/protect-light.ts
+++ b/src/devices/protect-light.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-light.ts: Light device class for UniFi Protect.
  */
diff --git a/src/devices/protect-liveviews.ts b/src/devices/protect-liveviews.ts
index 883a062..e9d54ed 100644
--- a/src/devices/protect-liveviews.ts
+++ b/src/devices/protect-liveviews.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-liveviews.ts: Liveviews class for UniFi Protect.
  */
diff --git a/src/devices/protect-nvr-systeminfo.ts b/src/devices/protect-nvr-systeminfo.ts
index 2bbcf30..8c80f92 100644
--- a/src/devices/protect-nvr-systeminfo.ts
+++ b/src/devices/protect-nvr-systeminfo.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-nvr-systeminfo.ts: NVR System Information device class for UniFi Protect.
  */
diff --git a/src/devices/protect-securitysystem.ts b/src/devices/protect-securitysystem.ts
index 9d2063c..efff717 100644
--- a/src/devices/protect-securitysystem.ts
+++ b/src/devices/protect-securitysystem.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-securitysystem.ts: Security system accessory for UniFi Protect.
  */
diff --git a/src/devices/protect-sensor.ts b/src/devices/protect-sensor.ts
index c9af928..20deddd 100644
--- a/src/devices/protect-sensor.ts
+++ b/src/devices/protect-sensor.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-sensor.ts: Sensor device class for UniFi Protect.
  */
diff --git a/src/devices/protect-viewer.ts b/src/devices/protect-viewer.ts
index cc545f2..2c962ea 100644
--- a/src/devices/protect-viewer.ts
+++ b/src/devices/protect-viewer.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-viewer.ts: Viewer device class for UniFi Protect.
  */
diff --git a/src/ffmpeg/index.ts b/src/ffmpeg/index.ts
index 3f84c3c..b918168 100644
--- a/src/ffmpeg/index.ts
+++ b/src/ffmpeg/index.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * index.ts: Protect FFmpeg classes.
  */
diff --git a/src/ffmpeg/protect-ffmpeg-codecs.ts b/src/ffmpeg/protect-ffmpeg-codecs.ts
index 9f52b5c..5f64867 100644
--- a/src/ffmpeg/protect-ffmpeg-codecs.ts
+++ b/src/ffmpeg/protect-ffmpeg-codecs.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2023-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2023-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-codecs.ts: probe FFmpeg capabilities and codecs.
  */
diff --git a/src/ffmpeg/protect-ffmpeg-exec.ts b/src/ffmpeg/protect-ffmpeg-exec.ts
index 641a2c2..e7f39eb 100644
--- a/src/ffmpeg/protect-ffmpeg-exec.ts
+++ b/src/ffmpeg/protect-ffmpeg-exec.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-exec.ts: Execute arbitrary FFmpeg commands and return the results.
  *
diff --git a/src/ffmpeg/protect-ffmpeg-options.ts b/src/ffmpeg/protect-ffmpeg-options.ts
index 32001e6..361f198 100644
--- a/src/ffmpeg/protect-ffmpeg-options.ts
+++ b/src/ffmpeg/protect-ffmpeg-options.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2023-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2023-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-options.ts: FFmpeg decoder and encoder options with hardware-accelerated codec support where available.
  */
diff --git a/src/ffmpeg/protect-ffmpeg-record.ts b/src/ffmpeg/protect-ffmpeg-record.ts
index 491bf72..3d9ede7 100644
--- a/src/ffmpeg/protect-ffmpeg-record.ts
+++ b/src/ffmpeg/protect-ffmpeg-record.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-record.ts: Provide FFmpeg process control to support HomeKit Secure Video.
  *
diff --git a/src/ffmpeg/protect-ffmpeg-stream.ts b/src/ffmpeg/protect-ffmpeg-stream.ts
index 426b702..9719435 100644
--- a/src/ffmpeg/protect-ffmpeg-stream.ts
+++ b/src/ffmpeg/protect-ffmpeg-stream.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg-stream.ts: Provide FFmpeg process control to support HomeKit livestreaming.
  *
diff --git a/src/ffmpeg/protect-ffmpeg.ts b/src/ffmpeg/protect-ffmpeg.ts
index 4411eee..9de76c3 100644
--- a/src/ffmpeg/protect-ffmpeg.ts
+++ b/src/ffmpeg/protect-ffmpeg.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-ffmpeg.ts: Base class to provide FFmpeg process control and capability introspection.
  *
diff --git a/src/index.ts b/src/index.ts
index 56eadba..5f58385 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * index.ts: homebridge-unifi-protect plugin registration.
  */
diff --git a/src/protect-events.ts b/src/protect-events.ts
index 1426841..4b8a4f3 100644
--- a/src/protect-events.ts
+++ b/src/protect-events.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-events.ts: Protect events class for UniFi Protect.
  */
@@ -196,7 +196,7 @@ export class ProtectEvents extends EventEmitter {
       }
 
       // Remove the device.
-      this.nvr.removeHomeKitDevice(protectDevice);
+      this.nvr.removeHomeKitDevice(protectDevice.accessory);
 
       return;
     }
diff --git a/src/protect-livestream.ts b/src/protect-livestream.ts
index fec5189..28c4ca1 100644
--- a/src/protect-livestream.ts
+++ b/src/protect-livestream.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2019-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2019-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-livestream.ts: Protect livestream API manager.
  */
diff --git a/src/protect-nvr.ts b/src/protect-nvr.ts
index 7daff75..82a69e2 100644
--- a/src/protect-nvr.ts
+++ b/src/protect-nvr.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-nvr.ts: NVR device class for UniFi Protect.
  */
@@ -157,7 +157,7 @@ export class ProtectNvr {
 
       // Unregister all the accessories for this controller from Homebridge that may have been restored already. Any additional ones will be automatically caught when
       // they are restored.
-      this.removeHomeKitAccessories(this.platform.accessories.filter(x => x.context.nvr === this.ufp.mac));
+      this.platform.accessories.filter(accessory => accessory.context.nvr === this.ufp.mac).map(accessory => this.removeHomeKitDevice(accessory));
 
       return;
     }
@@ -327,19 +327,25 @@ export class ProtectNvr {
       return false;
     }
 
+    // Generate this device's unique identifier.
+    const uuid = this.hap.uuid.generate(device.mac);
+
+    // See if we already know about this accessory.
+    let accessory = this.platform.accessories.find(x => x.UUID === uuid);
+
     // Enable or disable certain devices based on configuration parameters.
     if(!this.hasFeature("Device", device)) {
 
-      return false;
-    }
+      if(accessory) {
 
-    // Generate this device's unique identifier.
-    const uuid = this.hap.uuid.generate(device.mac);
+        this.removeHomeKitDevice(accessory, true);
+      }
 
-    let accessory: PlatformAccessory | undefined;
+      return false;
+    }
 
-    // See if we already know about this accessory or if it's truly new. If it is new, add it to HomeKit.
-    if((accessory = this.platform.accessories.find(x => x.UUID === uuid)) === undefined) {
+    // We've got a new device, let's add it to HomeKit.
+    if(!accessory) {
 
       accessory = new this.api.platformAccessory(validateName(device.name ?? device.marketName ?? ("Unknown Device" + (device.mac ? " " + device.mac : ""))), uuid);
 
@@ -414,8 +420,10 @@ export class ProtectNvr {
   // Cleanup removed Protect devices from HomeKit.
   private cleanupDevices(): void {
 
-    const delayInterval = this.getFeatureNumber("Nvr.DelayDeviceRemoval");
+    // Process the device removal queue before we do anything else.
+    this.platform.accessories.filter(accessory => Object.keys(this.deviceRemovalQueue).includes(accessory.UUID)).map(accessory => this.removeHomeKitDevice(accessory));
 
+    // Cleanup our accessories.
     for(const accessory of this.platform.accessories.filter(x => x.context.nvr === this.ufp.mac)) {
 
       const protectDevice = this.configuredDevices[accessory.UUID];
@@ -425,74 +433,7 @@ export class ProtectNvr {
       // catch those orphan devices here.
       if(!protectDevice) {
 
-        // We only remove devices if they're on the Protect controller we're interested in.
-        if(("nvr" in accessory.context) && (accessory.context.nvr !== this.ufp.mac)) {
-
-          continue;
-        }
-
-        // We only store MAC addresses on devices that exist on the Protect controller. Any other accessories created are ones we created ourselves and are managed
-        // elsewhere.
-        if(!("mac" in accessory.context)) {
-
-          // If it's not a package camera, we're done.
-          if(!("packageCamera" in accessory.context)) {
-
-            continue;
-          }
-
-          if((accessory.context.packageCamera as string).length) {
-
-            const uuid = this.hap.uuid.generate(accessory.context.packageCamera as string);
-
-            // If we have a matching parent camera for the package camera, we're done here. Otherwise, this is an orphan that we need to remove.
-            if(this.platform.accessories.some(x => x.UUID === uuid)) {
-
-              continue;
-            }
-          }
-        }
-
-        // For certain use cases, we may want to defer removal of a Protect device (e.g. in stacked NVR configurations) where Protect may lose track of devices for a
-        // brief period of time. This prevents a potential back-and-forth where devices are removed momentarily only to be readded later.
-        if(delayInterval && (delayInterval > 0)) {
-
-          // Have we seen this device queued for removal previously? If not, let's add it to the queue and come back after our specified delay.
-          if(!this.deviceRemovalQueue[accessory.UUID]) {
-
-            this.deviceRemovalQueue[accessory.UUID] = Date.now();
-
-            this.log.info("%s: Delaying device removal for at least %s second%s.", accessory.displayName, delayInterval, delayInterval > 1 ? "s" : "");
-
-            continue;
-          }
-
-          // Is it time to process this device removal?
-          if((delayInterval * 1000) > (Date.now() - this.deviceRemovalQueue[accessory.UUID])) {
-
-            continue;
-          }
-
-          // Cleanup after ourselves.
-          delete this.deviceRemovalQueue[accessory.UUID];
-        }
-
-        // See if we can pull the device's configuration details from the controller.
-        const device = ProtectDeviceCategories.map(category => this.ufpApi.bootstrap && this.ufpApi.bootstrap[category + "s"] &&
-          ((this.ufpApi.bootstrap[category + "s"] as ProtectDeviceConfigTypes[]) ?? []).find(x => x.mac === accessory.context.mac)).reduce((acc, x) => x ?? acc, null);
-
-        this.log.info("%s: Removing %s from HomeKit.%s", device ? this.ufpApi.getDeviceName(device) : accessory.displayName, device ? device.modelKey : "device",
-          accessory._associatedHAPAccessory.bridged ? "" : " You will need to manually delete the device in the Home app to complete the removal.");
-
-        // Unregister the accessory and delete it's remnants from HomeKit. We can only unregister bridged accessories - standalone acceossories are managed directly by
-        // users in the Home app.
-        if(accessory._associatedHAPAccessory.bridged) {
-
-          this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [ accessory ]);
-        }
-
-        this.platform.accessories.splice(this.platform.accessories.indexOf(accessory), 1);
-        this.api.updatePlatformAccessories(this.platform.accessories);
+        this.removeHomeKitDevice(accessory);
 
         continue;
       }
@@ -516,136 +457,125 @@ export class ProtectNvr {
         continue;
       }
 
+      // Remove and then add the device back to HomeKit if we're really just transitioning between bridged and standalone devices.
+      if(protectDevice.hints.enabled && ((!accessory._associatedHAPAccessory.bridged && !protectDevice.hints.standalone) ||
+        (accessory._associatedHAPAccessory.bridged && protectDevice.hints.standalone))) {
+
+        this.removeHomeKitDevice(accessory, true);
+        this.addHomeKitDevice(protectDevice.ufp);
+
+        continue;
+      }
+
       // Process the device removal.
-      this.removeHomeKitDevice(this.configuredDevices[accessory.UUID]);
+      this.removeHomeKitDevice(accessory);
     }
   }
 
-  // Remove an individual Protect device from HomeKit.
-  public removeHomeKitDevice(protectDevice: ProtectDevice): void {
+  // Remove an individual Protect accessory from HomeKit.
+  public removeHomeKitDevice(accessory: PlatformAccessory, noRemovalDelay = false): void {
 
-    // Sanity check.
-    if(!protectDevice) {
+    // Ensure that this accessory hasn't already been removed.
+    if(!this.platform.accessories.some(x => x.UUID === accessory.UUID)) {
 
       return;
     }
 
     // We only remove devices if they're on the Protect controller we're interested in.
-    if(protectDevice.accessory.context.nvr !== this.ufp.mac) {
+    if(accessory.context.nvr !== this.ufp.mac) {
 
       return;
     }
 
-    // Package cameras are handled elsewhere.
-    if("packageCamera" in protectDevice.accessory.context) {
-
-      const uuid = this.hap.uuid.generate(protectDevice.accessory.context.packageCamera as string);
-
-      // If we have a matching parent camera, we're done here. Otherwise, this is an orphan that we need to remove.
-      if(this.platform.accessories.some(x => x.UUID === uuid)) {
+    // The NVR system information accessory is handled elsewhere.
+    if(accessory.context.systemInfo) {
 
-        return;
-      }
+      return;
     }
 
-    // The NVR system information accessory is handled elsewhere.
-    if("systemInfo" in protectDevice.accessory.context) {
+    // Liveview-centric accessories are handled elsewhere.
+    if(accessory.context.liveview || accessory.getService(this.hap.Service.SecuritySystem)) {
 
       return;
     }
 
-    // Liveview-centric accessories are handled elsewhere.
-    if(("liveview" in protectDevice.accessory.context) || protectDevice.accessory.getService(this.hap.Service.SecuritySystem)) {
+    // We only store MAC addresses on devices that exist on the Protect controller. Any other accessories created are ones we created ourselves and are managed
+    // elsewhere, with one exception - package cameras. If we have a matching parent camera for the package camera, we're done here. Package cameras are dealt with
+    // when we remove the parent camera. If the parent doesn't exist, this is an orphan that we need to remove.
+    if(!accessory.context.mac &&
+      (!accessory.context.packageCamera || (this.platform.accessories.some(x => x.context.mac === accessory.context.packageCamera)))) {
 
       return;
     }
 
-    // For certain use cases, we may want to defer removal of a Protect device (e.g. in stacked NVR configurations) where Protect may lose track of devices for a brief
-    // period of time. This prevents a potential back-and-forth where devices are removed momentarily only to be readded later.
-    const delayInterval = this.getFeatureNumber("Nvr.DelayDeviceRemoval");
+    const delayInterval = this.getFeatureNumber("Nvr.DelayDeviceRemoval") ?? 0;
 
-    if(delayInterval && (delayInterval > 0)) {
+    // For certain use cases, we may want to defer removal of a Protect device where Protect may lose track of devices for a brief period of time. This prevents a
+    // potential back-and-forth where devices are removed momentarily only to be readded later.
+    if(!noRemovalDelay && delayInterval) {
 
       // Have we seen this device queued for removal previously? If not, let's add it to the queue and come back after our specified delay.
-      if(!this.deviceRemovalQueue[protectDevice.accessory.UUID]) {
+      if(!this.deviceRemovalQueue[accessory.UUID]) {
 
-        this.deviceRemovalQueue[protectDevice.accessory.UUID] = Date.now();
+        this.deviceRemovalQueue[accessory.UUID] = Date.now();
 
-        this.log.info("%s: Delaying device removal for %s second%s.",
-          protectDevice.ufp.name ? this.ufpApi.getDeviceName(protectDevice.ufp) : protectDevice.accessoryName,
-          delayInterval, delayInterval > 1 ? "s" : "");
+        this.log.info("%s: Delaying device removal for at least %s second%s.", accessory.displayName, delayInterval, delayInterval > 1 ? "s" : "");
 
         return;
       }
 
       // Is it time to process this device removal?
-      if((delayInterval * 1000) > (Date.now() - this.deviceRemovalQueue[protectDevice.accessory.UUID])) {
+      if((delayInterval * 1000) > (Date.now() - this.deviceRemovalQueue[accessory.UUID])) {
 
         return;
       }
-
-      // Cleanup after ourselves.
-      delete this.deviceRemovalQueue[protectDevice.accessory.UUID];
     }
 
-    // Remove this device.
-    this.log.info("%s: Removing %s from HomeKit.%s",
-      protectDevice.ufp.name ? this.ufpApi.getDeviceName(protectDevice.ufp) : protectDevice.accessoryName,
-      protectDevice.ufp.modelKey ? protectDevice.ufp.modelKey : "device",
-      protectDevice.accessory._associatedHAPAccessory.bridged ? "" : " You will need to manually delete the device in the Home app to complete the removal.");
+    // Cleanup after ourselves.
+    delete this.deviceRemovalQueue[accessory.UUID];
 
-    // Keep track of whether this was a standalone accessory or not to deal with the special case of a user transitioning between bridged and standalone devices.
-    const isStandalone = !protectDevice.accessory._associatedHAPAccessory.bridged;
+    // Grab our instance of the Protect device, if it exists.
+    const protectDevice = this.configuredDevices[accessory.UUID];
 
-    const deletingAccessories = [ protectDevice.accessory ];
+    // See if we can pull the device's configuration details from our Protect device instance or the controller.
+    const device = protectDevice?.ufp ?? ProtectDeviceCategories.map(category => this.ufpApi.bootstrap && this.ufpApi.bootstrap[category + "s"] &&
+      ((this.ufpApi.bootstrap[category + "s"] as ProtectDeviceConfigTypes[]) ?? []).find(x => x.mac === accessory.context.mac)).reduce((acc, x) => x ?? acc, null);
 
-    // Check to see if we're removing a camera device that has a package camera as well.
-    if(protectDevice.ufp.modelKey === "camera") {
+    this.log.info("%s: Removing %s from HomeKit.%s",
+      device ? this.ufpApi.getDeviceName(device) : protectDevice?.accessoryName ?? accessory.displayName,
+      device?.modelKey ?? "device",
+      accessory._associatedHAPAccessory.bridged ? "" : " You will need to manually delete the device in the Home app to complete the removal.");
 
-      const protectDoorbell = protectDevice as ProtectDoorbell;
+    const deletingAccessories = [ accessory ];
 
-      if(protectDoorbell && protectDoorbell.packageCamera) {
+    // If it's an unknown device or a camera, look for a corresponding package camera if we have one and remove it as well.
+    if(!device || (device?.modelKey === "camera")) {
 
-        // Ensure we delete the accessory and cleanup after ourselves.
-        deletingAccessories.push(protectDoorbell.packageCamera.accessory);
-        protectDoorbell.packageCamera.cleanup();
-        protectDoorbell.packageCamera = null;
-      }
-    }
+      const packageCameraAccessory = this.platform.accessories.find(x => x.context.packageCamera === accessory.context.mac);
 
-    // Cleanup our event handlers.
-    protectDevice.cleanup();
+      // Remove the package camera, if it exists, and cleanup the device if it's been confgured.
+      if(packageCameraAccessory) {
 
-    // Finally, remove it from our list of configured devices and HomeKit.
-    delete this.configuredDevices[protectDevice.accessory.UUID];
-    this.removeHomeKitAccessories(deletingAccessories);
-
-    // Add it back to HomeKit if we're really just transitioning between bridged and standalone devices.
-    if(protectDevice.hints.enabled && ((isStandalone && !protectDevice.hints.standalone) || (!isStandalone && protectDevice.hints.standalone))) {
-
-      this.addHomeKitDevice(protectDevice.ufp);
+        deletingAccessories.push(packageCameraAccessory);
+      }
     }
-  }
 
-  // Remove accessories from HomeKit and Homebridge.
-  private removeHomeKitAccessories(deletingAccessories: PlatformAccessory[]): void {
+    // Cleanup our device instance.
+    protectDevice?.cleanup();
 
-    // Sanity check.
-    if(!deletingAccessories || (deletingAccessories.length <= 0)) {
-
-      return;
-    }
+    // Finally, remove it from our list of configured devices and HomeKit.
+    delete this.configuredDevices[accessory.UUID];
 
     // Update our internal list of all the accessories we know about.
-    for(const accessory of deletingAccessories) {
+    for(const targetAccessory of deletingAccessories) {
 
       // Unregister the accessory from HomeKit if we have a bridged accessory. Unbridged accessories are managed directly by users in the Home app.
-      if(accessory._associatedHAPAccessory.bridged) {
+      if(targetAccessory._associatedHAPAccessory.bridged) {
 
-        this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [ accessory ]);
+        this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [ targetAccessory ]);
       }
 
-      this.platform.accessories.splice(this.platform.accessories.indexOf(accessory), 1);
+      this.platform.accessories.splice(this.platform.accessories.indexOf(targetAccessory), 1);
     }
 
     // Tell Homebridge to save the updated list of accessories.
diff --git a/src/protect-options.ts b/src/protect-options.ts
index 1ca44b9..8624d45 100644
--- a/src/protect-options.ts
+++ b/src/protect-options.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2020-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2020-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-options.ts: Feature option and type definitions for UniFi Protect.
  */
diff --git a/src/protect-platform.ts b/src/protect-platform.ts
index d0d5d07..bab9b6b 100644
--- a/src/protect-platform.ts
+++ b/src/protect-platform.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-platform.ts: homebridge-unifi-protect platform class.
  */
diff --git a/src/protect-record.ts b/src/protect-record.ts
index 93f2fc5..e119695 100644
--- a/src/protect-record.ts
+++ b/src/protect-record.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-record.ts: Homebridge camera recording delegate implementation for UniFi Protect to support HomeKit Secure Video.
  *
diff --git a/src/protect-snapshot.ts b/src/protect-snapshot.ts
index 6b85709..846984c 100644
--- a/src/protect-snapshot.ts
+++ b/src/protect-snapshot.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-snapshot.ts: UniFi Protect HomeKit snapshot class.
  */
diff --git a/src/protect-stream.ts b/src/protect-stream.ts
index 7e65991..ed11c6a 100644
--- a/src/protect-stream.ts
+++ b/src/protect-stream.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-stream.ts: Homebridge camera streaming delegate implementation for Protect.
  *
@@ -983,7 +983,7 @@ export class ProtectStreamingDelegate implements CameraStreamingDelegate {
       // Send the audio.
       ffmpegReturnAudio.stdout?.on("data", dataListener = (data: Buffer): void => {
 
-        ws?.send(data, (error: Error | undefined): void => {
+        ws?.send(data, (error?: Error): void => {
 
           // This happens when an error condition is encountered on sending data to the websocket. We assume the worst and close our talkback channel.
           if(error) {
@@ -1129,6 +1129,6 @@ export class ProtectStreamingDelegate implements CameraStreamingDelegate {
   // Utility to return the currently set probesize for a camera.
   public get probesize(): number {
 
-    return this.probesizeOverride ? this.probesizeOverride : this.protectCamera.hints.probesize;
+    return this.probesizeOverride || this.protectCamera.hints.probesize;
   }
 }
diff --git a/src/protect-timeshift.ts b/src/protect-timeshift.ts
index a1393d6..0717923 100644
--- a/src/protect-timeshift.ts
+++ b/src/protect-timeshift.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2017-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2017-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-timeshift.ts: UniFi Protect livestream timeshift buffer implementation to support HomeKit Secure Video.
  */
diff --git a/src/protect-types.ts b/src/protect-types.ts
index 3838b25..c43eb84 100644
--- a/src/protect-types.ts
+++ b/src/protect-types.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2020-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2020-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * protect-types.ts: Interface and type definitions for UniFi Protect.
  */
diff --git a/src/settings.ts b/src/settings.ts
index f380f50..f80d19c 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,4 +1,4 @@
-/* Copyright(C) 2022-2024, HJD (https://github.com/hjdhjd). All rights reserved.
+/* Copyright(C) 2022-2025, HJD (https://github.com/hjdhjd). All rights reserved.
  *
  * settings.ts: Settings and constants for homebridge-unifi-protect.
  */