diff --git a/lnbits/task_manager.py b/lnbits/task_manager.py
index 8ee0e31a8..55c57efc6 100644
--- a/lnbits/task_manager.py
+++ b/lnbits/task_manager.py
@@ -526,7 +526,7 @@ async def relay_ws_queue(
     Shared by the blockexplorer address/tx/block websocket endpoints.
     """
     try:
-        while True:
+        while settings.lnbits_running:
             recv_task = asyncio.create_task(websocket.receive())
             event_task = asyncio.create_task(queue.get())
             done, pending = await asyncio.wait(