diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json
index bfaa5d99a..4ce1d72df 100644
--- a/plugins/cloud/package-lock.json
+++ b/plugins/cloud/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/cloud",
-   "version": "0.2.15",
+   "version": "0.2.17",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/cloud",
-         "version": "0.2.15",
+         "version": "0.2.17",
          "dependencies": {
             "@eneris/push-receiver": "^3.1.5",
             "@scrypted/common": "file:../../common",
diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json
index 98aee1130..65ab6d083 100644
--- a/plugins/cloud/package.json
+++ b/plugins/cloud/package.json
@@ -53,5 +53,5 @@
       "@types/nat-upnp": "^1.1.5",
       "@types/node": "^20.14.6"
    },
-   "version": "0.2.15"
+   "version": "0.2.17"
 }
diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts
index 8cb64f330..0e15bb54c 100644
--- a/plugins/cloud/src/main.ts
+++ b/plugins/cloud/src/main.ts
@@ -888,7 +888,11 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
         this.proxy.on('proxyRes', (res, req) => {
             res.headers['X-Scrypted-Cloud'] = req.headers['x-scrypted-cloud'];
             res.headers['X-Scrypted-Direct-Address'] = req.headers['x-scrypted-direct-address'];
-            res.headers['X-Scrypted-Cloud-Address'] = this.cloudflareTunnel;
+            let domain: string;
+            if (this.storageSettings.values.forwardingMode === 'Custom Domain' && this.storageSettings.values.hostname)
+                domain = `https://${this.storageSettings.values.hostname}`;
+            domain ||= this.cloudflareTunnel;
+            res.headers['X-Scrypted-Cloud-Address'] = domain;
             res.headers['Access-Control-Expose-Headers'] = 'X-Scrypted-Cloud, X-Scrypted-Direct-Address, X-Scrypted-Cloud-Address';
         });