diff --git a/main/lib/idds/agents/common/plugins/messaging.py b/main/lib/idds/agents/common/plugins/messaging.py
index f1ced334..48132de5 100644
--- a/main/lib/idds/agents/common/plugins/messaging.py
+++ b/main/lib/idds/agents/common/plugins/messaging.py
@@ -73,7 +73,7 @@ def __init__(self, name="MessagingSender", **kwargs):
         if not hasattr(self, 'destination'):
             raise Exception('destination is required but not defined.')
         if not hasattr(self, 'broker_timeout'):
-            self.broker_timeout = 10
+            self.broker_timeout = 60
         else:
             self.broker_timeout = int(self.broker_timeout)
 
@@ -118,6 +118,7 @@ def connect_to_messaging_brokers(self, sender=True):
             conn = stomp.Connection12(host_and_ports=[(broker, port)],
                                       vhost=self.vhost,
                                       keepalive=True,
+                                      heartbeats=(60000, 60000),     # one minute
                                       timeout=timeout)
             conns.append(conn)
         return conns