diff --git a/server/model/monitor.js b/server/model/monitor.js
index ab77ff69..6f1631bb 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -359,8 +359,10 @@ class Monitor extends BeanModel {
                         });
                         bean.status = UP;
                     } catch (error) {
-                        bean.status = DOWN;
-                        bean.msg = error.message;
+                        if (error.message !== "Timeout") {
+                            bean.status = DOWN;
+                            bean.msg = error.message;
+                        }
                     }
                 } else {
                     bean.msg = "Unknown Monitor Type";
diff --git a/server/util-server.js b/server/util-server.js
index 01545b41..98de7662 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -131,6 +131,7 @@ exports.mqttAsync = function (hostname, topic, okMessage, options = {}) {
 
         setTimeout(() => {
             client.end();
+            reject("Timeout");
         }, interval * 1000);
 
     });