diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 88b74e17f0c6..6222ed7c6720 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -510,7 +510,7 @@ async def _get_to_device_messages(
             return []
 
         # Retrieve the to-device messages for each user
-        recipient_device_to_messages = await self.store.get_new_messages(
+        recipient_device_to_messages = await self.store.get_messages_for_user_devices(
             users_appservice_is_interested_in,
             from_key,
             new_token,
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 4b3f1ea0595c..3f80bc83ea3f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1336,7 +1336,7 @@ async def _generate_sync_entry_for_to_device(
             since_stream_id = int(sync_result_builder.since_token.to_device_key)
 
         if since_stream_id != int(now_token.to_device_key):
-            messages, stream_id = await self.store.get_new_messages_for_device(
+            messages, stream_id = await self.store.get_messages_for_device(
                 user_id, device_id, since_stream_id, now_token.to_device_key
             )