diff --git a/server/package-lock.json b/server/package-lock.json
index 07a0a2599..ba9cf88fb 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.123.3",
+  "version": "0.123.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.123.3",
+      "version": "0.123.4",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/server/package.json b/server/package.json
index f8a22d1f1..332ee0c02 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.123.4",
+  "version": "0.123.5",
   "description": "",
   "dependencies": {
     "@scrypted/ffmpeg-static": "^6.1.0-build3",
diff --git a/server/src/scrypted-cluster.ts b/server/src/scrypted-cluster.ts
index 2619ddc3d..4498226d5 100644
--- a/server/src/scrypted-cluster.ts
+++ b/server/src/scrypted-cluster.ts
@@ -74,13 +74,14 @@ export function getScryptedClusterMode(): ['server' | 'client', string, number]
     }
     else {
         // the cluster address may come from the server:port combo or address variable but not both.
-        if (address && server)
+        if (address && server && server !== address)
             throw new Error('SCRYPTED_CLUSTER_ADDRESS and SCRYPTED_CLUSTER_SERVER must not both be used.');
 
         const serverAddress = address || server;
         if (!net.isIP(serverAddress))
             throw new Error('SCRYPTED_CLUSTER_ADDRESS is not set.');
         process.env.SCRYPTED_CLUSTER_ADDRESS = serverAddress;
+        delete process.env.SCRYPTED_CLUSTER_SERVER;
     }
 
     return [mode, server, port];