diff --git a/backend/heartbeat_listener.py b/backend/heartbeat_listener.py
index 8f8be3eb9..8385b370f 100644
--- a/backend/heartbeat_listener.py
+++ b/backend/heartbeat_listener.py
@@ -3,6 +3,7 @@
 import logging
 import os
 from datetime import datetime
+import time
 
 from aio_pika import connect_robust
 from aio_pika.abc import AbstractIncomingMessage
@@ -17,6 +18,9 @@
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
+timeout = 5 * 60  # five minute timeout
+time_ran = 0
+
 
 async def callback(message: AbstractIncomingMessage):
     """This method receives messages from RabbitMQ and processes them.
@@ -118,4 +122,14 @@ async def listen_for_heartbeats():
 
 
 if __name__ == "__main__":
-    asyncio.run(listen_for_heartbeats())
+    start = datetime.now()
+    while time_ran < timeout:
+        try:
+            asyncio.run(listen_for_heartbeats())
+        except Exception as e:
+            logger.info(f" Heartbeat listner failed, retry in 10 seconds...")
+            time.sleep(10)
+            current_time = datetime.now()
+            current_seconds = (current_time - start).total_seconds()
+            time_ran += current_seconds
+    logger.info(f" Heartbeat listener could not connect to rabbitmq.")
diff --git a/backend/message_listener.py b/backend/message_listener.py
index 448101484..ac46070a8 100644
--- a/backend/message_listener.py
+++ b/backend/message_listener.py
@@ -5,6 +5,7 @@
 import random
 import string
 from datetime import datetime
+import time
 
 from aio_pika import connect_robust
 from aio_pika.abc import AbstractIncomingMessage
@@ -22,6 +23,9 @@
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
+timeout = 5 * 60  # five minute timeout
+time_ran = 0
+
 
 def parse_message_status(msg):
     """Determine if the message corresponds to start/middle/end of job if possible. See pyclowder.utils.StatusMessage."""
@@ -219,4 +223,14 @@ async def listen_for_messages():
 
 
 if __name__ == "__main__":
-    asyncio.run(listen_for_messages())
+    start = datetime.now()
+    while time_ran < timeout:
+        try:
+            asyncio.run(listen_for_messages())
+        except Exception as e:
+            logger.info(f" Message listener failed, retry in 10 seconds...")
+            time.sleep(10)
+            current_time = datetime.now()
+            current_seconds = (current_time - start).total_seconds()
+            time_ran += current_seconds
+    logger.info(f"Message listener could not connect to rabbitmq. Timeout.")