diff --git a/python/fedml/__init__.py b/python/fedml/__init__.py
index ee86528b6f..88312d36a6 100644
--- a/python/fedml/__init__.py
+++ b/python/fedml/__init__.py
@@ -25,7 +25,7 @@
 _global_training_type = None
 _global_comm_backend = None
 
-__version__ = "0.8.8a23"
+__version__ = "0.8.8a24"
 
 
 def init(args=None):
diff --git a/python/fedml/cli/server_deployment/server_runner.py b/python/fedml/cli/server_deployment/server_runner.py
index bd4ac4b530..75c6216d9f 100755
--- a/python/fedml/cli/server_deployment/server_runner.py
+++ b/python/fedml/cli/server_deployment/server_runner.py
@@ -634,7 +634,7 @@ def cleanup_run_when_finished(self):
         logging.info("Cleanup run successfully when finished.")
 
         self.mlops_metrics.broadcast_server_training_status(
-            self.run_id, ServerConstants.MSG_MLOPS_SERVER_STATUS_FINISHED
+            self.run_id, ServerConstants.MSG_MLOPS_SERVER_STATUS_FINISHED, edge_id=self.edge_id
         )
 
         try:
@@ -661,7 +661,9 @@ def cleanup_run_when_starting_failed(self):
 
         logging.info("Cleanup run successfully when starting failed.")
 
-        self.mlops_metrics.broadcast_server_training_status(self.run_id, ServerConstants.MSG_MLOPS_SERVER_STATUS_FAILED)
+        self.mlops_metrics.broadcast_server_training_status(self.run_id,
+                                                            ServerConstants.MSG_MLOPS_SERVER_STATUS_FAILED,
+                                                            edge_id=self.edge_id)
 
         try:
             self.mlops_metrics.stop_sys_perf()
diff --git a/python/fedml/core/mlops/mlops_metrics.py b/python/fedml/core/mlops/mlops_metrics.py
index 235d5f7924..eff82ac2aa 100644
--- a/python/fedml/core/mlops/mlops_metrics.py
+++ b/python/fedml/core/mlops/mlops_metrics.py
@@ -268,7 +268,7 @@ def common_report_server_training_status(self, run_id, status, role=None):
         self.messenger.send_message_json(topic_name, message_json)
         self.report_server_id_status(run_id, status)
 
-    def broadcast_server_training_status(self, run_id, status, role=None, is_from_model=False):
+    def broadcast_server_training_status(self, run_id, status, role=None, is_from_model=False, edge_id=None):
         if self.messenger is None:
             return
         topic_name = "fl_run/fl_server/mlops/status"
@@ -276,7 +276,7 @@ def broadcast_server_training_status(self, run_id, status, role=None, is_from_mo
             role = "normal"
         msg = {
             "run_id": run_id,
-            "edge_id": self.edge_id,
+            "edge_id": self.edge_id if edge_id is None else edge_id,
             "status": status,
             "role": role,
         }
diff --git a/python/setup.py b/python/setup.py
index 42c162ab7d..4b2c703e33 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -91,7 +91,7 @@ def finalize_options(self):
 
 setup(
     name="fedml",
-    version="0.8.8a23",
+    version="0.8.8a24",
     author="FedML Team",
     author_email="ch@fedml.ai",
     description="A research and production integrated edge-cloud library for "