diff --git a/app/radio_sync.py b/app/radio_sync.py
index b2dab77..9c73874 100644
--- a/app/radio_sync.py
+++ b/app/radio_sync.py
@@ -315,6 +315,7 @@ async def _message_poll_loop():
                     async with radio_manager.radio_operation(
                         "message_poll_loop",
                         blocking=False,
+                        suspend_auto_fetch=True,
                     ) as mc:
                         await poll_for_messages(mc)
                 except RadioOperationBusyError:
diff --git a/tests/test_radio_sync.py b/tests/test_radio_sync.py
index d2844e3..94f598c 100644
--- a/tests/test_radio_sync.py
+++ b/tests/test_radio_sync.py
@@ -843,6 +843,8 @@ def _make_connected_manager() -> tuple[RadioManager, MagicMock]:
     rm = RadioManager()
     mock_mc = MagicMock(name="lock_scoped_mc")
     mock_mc.is_connected = True
+    mock_mc.stop_auto_message_fetching = AsyncMock()
+    mock_mc.start_auto_message_fetching = AsyncMock()
     rm._meshcore = mock_mc
     return rm, mock_mc