diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift
index 7318a54e92..365f23c33e 100644
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -1473,14 +1473,12 @@ class ChatReceiver {
     }
 
     func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg() {
-            self._lastMsgTime = .now
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
+        while self.receiveMessages {
+            if let msg = await chatRecvMsg() {
+                self._lastMsgTime = .now
+                await processReceivedMsg(msg)
+            }
             _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
         }
     }