diff --git a/meshcentral-config-schema.json b/meshcentral-config-schema.json
index 107ab8cc..b5f5d7a9 100644
--- a/meshcentral-config-schema.json
+++ b/meshcentral-config-schema.json
@@ -65,7 +65,8 @@
         "npmPath": { "type": "string" },
         "npmProxy": { "type": "string", "format": "uri" },
         "allowHighQualityDesktop": { "type": "boolean", "default": true },
-        "desktopMultiplex": { "type": "boolean", "default": false },
+        "publicPushNotifications": { "type": "boolean", "default": false, "description": "When true, this server uses MeshCentral.com a push notification relay for Android notifications. Push notifications work even if the Android app is not open." },
+        "desktopMultiplex": { "type": "boolean", "default": false, "description": "When true, enabled a server modules that efficiently splits a remote desktop stream to multiple browsers. Also allows slow browsers to not slow down the session for fast ones, this comes at the cost of extra server memory and processing for all remote desktop sessions." },
         "userAllowedIP": { "type": [ "string", "array" ] },
         "userBlockedIP": { "type": [ "string", "array" ] },
         "agentAllowedIP": { "type": [ "string", "array" ] },
diff --git a/meshcentral.js b/meshcentral.js
index e4f60a0d..0fa7caab 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -1551,9 +1551,9 @@ function CreateMeshCentralServer(config, args) {
                 } else if ((typeof config.firebaserelay == 'object') && (typeof config.firebaserelay.url == 'string')) {
                     // Setup the push messaging relay
                     obj.firebase = require('./firebase').CreateFirebaseRelay(obj, config.firebaserelay.url, config.firebaserelay.key);
-                } else if (typeof config.firebaserelay == true) {
-                    // Setup the push messaging relay using https://meshcentral.com
-                    obj.firebase = require('./firebase').CreateFirebaseRelay(obj, 'https://central.mesh.meshcentral.com/firebaserelay.aspx');
+                } else if (obj.config.settings.publicpushnotifications === true) {
+                    // Setup the Firebase push messaging relay using https://meshcentral.com, this is the public push notification server.
+                    obj.firebase = require('./firebase').CreateFirebaseRelay(obj, 'https://meshcentral.com/firebaserelay.aspx');
                 }
 
                 // Start periodic maintenance
diff --git a/package.json b/package.json
index 6733affe..875c616e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.7.63",
+  "version": "0.7.64",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
diff --git a/sample-config-advanced.json b/sample-config-advanced.json
index 80fc6ae1..fb6843b0 100644
--- a/sample-config-advanced.json
+++ b/sample-config-advanced.json
@@ -51,6 +51,7 @@
     "_npmPath": "c:\\npm.exe",
     "_npmProxy": "http://1.2.3.4:80",
     "_allowHighQualityDesktop": true,
+    "_publicPushNotifications": true,
     "_desktopMultiplex": true,
     "_userAllowedIP": "127.0.0.1,192.168.1.0/24",
     "_userBlockedIP": "127.0.0.1,::1,192.168.0.100",