diff --git a/server/model/monitor.js b/server/model/monitor.js
index a50baccf..b7b24971 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -11,6 +11,7 @@ const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalCli
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification");
+const { demoMode } = require("../server");
 const version = require("../../package.json").version;
 
 /**
@@ -334,6 +335,13 @@ class Monitor extends BeanModel {
             previousBeat = bean;
 
             if (! this.isStop) {
+
+                if (demoMode) {
+                    if (beatInterval < 20) {
+                        beatInterval = 20;
+                    }
+                }
+
                 this.heartbeatInterval = setTimeout(beat, beatInterval * 1000);
             }
 
diff --git a/server/server.js b/server/server.js
index ddd68695..984e73ad 100644
--- a/server/server.js
+++ b/server/server.js
@@ -66,12 +66,13 @@ const sslCert = process.env.SSL_CERT || args["ssl-cert"] || undefined;
 
 // Demo Mode?
 const demoMode = args["demo"] || false;
+exports.demoMode = demoMode;
 
 if (demoMode) {
     console.log("==== Demo Mode ====");
 }
 
-console.log("Creating express and socket.io instance")
+console.log("Creating express and socket.io instance");
 const app = express();
 
 let server;