diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 9c75a224e..b6094b339 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -2076,6 +2076,9 @@ int main(int argc, char **argv)
     ss_dassert(worker);
     worker->run();
 
+    /*< Stop all the monitors */
+    monitorStopAll();
+
     /** Stop administrative interface */
     mxs_admin_shutdown();