diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py
index 80badd26d..6f5c6126b 100644
--- a/lnbits/wallets/base.py
+++ b/lnbits/wallets/base.py
@@ -7,6 +7,8 @@ from typing import TYPE_CHECKING, NamedTuple
 
 from loguru import logger
 
+from lnbits.settings import settings
+
 if TYPE_CHECKING:
     from lnbits.nodes.base import Node
 
@@ -139,7 +141,7 @@ class Wallet(ABC):
         pass
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-        while True:
+        while settings.lnbits_running:
             for invoice in self.pending_invoices:
                 try:
                     status = await self.get_invoice_status(invoice)
diff --git a/lnbits/wallets/boltz.py b/lnbits/wallets/boltz.py
index fa7bf878e..87d236d1d 100644
--- a/lnbits/wallets/boltz.py
+++ b/lnbits/wallets/boltz.py
@@ -236,7 +236,7 @@ class BoltzWallet(Wallet):
         return PaymentFailedStatus()
 
     async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-        while True:
+        while settings.lnbits_running:
             try:
                 request = boltzrpc_pb2.GetSwapInfoRequest()
                 info: boltzrpc_pb2.GetSwapInfoResponse
diff --git a/lnbits/wallets/breez.py b/lnbits/wallets/breez.py
index 363acb124..87f80a62f 100644
--- a/lnbits/wallets/breez.py
+++ b/lnbits/wallets/breez.py
@@ -277,7 +277,7 @@ else:
                 return PaymentPendingStatus()
 
         async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
-            while True:
+            while settings.lnbits_running:
                 event = await breez_event_queue.get()
                 if event.is_invoice_paid():
                     yield event.details.payment_hash