diff --git a/server/server.js b/server/server.js
index d4bdffb65..3ea013670 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1248,6 +1248,9 @@ let needSetup = false;
                     monitorID,
                     value,
                 ]);
+
+                await server.sendUpdateMonitorIntoList(socket, monitorID);
+
                 callback({
                     ok: true,
                     msg: "successAdded",
@@ -1271,6 +1274,9 @@ let needSetup = false;
                     tagID,
                     monitorID,
                 ]);
+
+                await server.sendUpdateMonitorIntoList(socket, monitorID);
+
                 callback({
                     ok: true,
                     msg: "successEdited",
@@ -1294,6 +1300,9 @@ let needSetup = false;
                     monitorID,
                     value,
                 ]);
+
+                await server.sendUpdateMonitorIntoList(socket, monitorID);
+
                 callback({
                     ok: true,
                     msg: "successDeleted",
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 72238c1d8..3d2de0857 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -223,7 +223,9 @@ class UptimeKumaServer {
      */
     async sendUpdateMonitorIntoList(socket, monitorID) {
         let list = await this.getMonitorJSONList(socket.userID, monitorID);
-        this.io.to(socket.userID).emit("updateMonitorIntoList", list);
+        if (list && list[monitorID]) {
+            this.io.to(socket.userID).emit("updateMonitorIntoList", list);
+        }
     }
 
     /**