diff --git a/server/model/monitor.js b/server/model/monitor.js
index b632cb8c6..0e86c4a19 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -1270,6 +1270,7 @@ class Monitor extends BeanModel {
             (previousBeatStatus === DOWN && currentBeatStatus === MAINTENANCE) ||
             (previousBeatStatus === UP && currentBeatStatus === DOWN) ||
             (previousBeatStatus === DOWN && currentBeatStatus === UP) ||
+            (previousBeatStatus === PENDING && currentBeatStatus === MAINTENANCE) ||
             (previousBeatStatus === PENDING && currentBeatStatus === DOWN);
     }
 
@@ -1290,7 +1291,7 @@ class Monitor extends BeanModel {
             } else if (bean.status === DOWN) {
                 text = "🔴 Down";
             } else if (bean.status === MAINTENANCE) {
-                text = "🔵 Maintenance";
+                text = "Under Maintenance";
             }
 
             let msg = `[${monitor.name}] [${text}] ${bean.msg}`;