diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index acae34e71f..ed4600049f 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -20,7 +20,6 @@
 #
 #
 import logging
-import random
 from threading import Lock
 from typing import (
     TYPE_CHECKING,
@@ -875,7 +874,7 @@ class DeviceHandler:
         """
 
         await self._handle_room_un_partial_stated_client(
-            instance_name=random.choice(self._device_list_writers),
+            instance_name=self._device_list_writers[-1],  # TEMP
             room_id=room_id,
         )
 
@@ -892,7 +891,7 @@ class DeviceHandler:
             device_ids: The device IDs that have changed.
         """
         await self._notify_device_update_client(
-            instance_name=random.choice(self._device_list_writers),
+            instance_name=self._device_list_writers[-1],  # TEMP
             user_id=user_id,
             device_ids=list(device_ids),
         )
@@ -909,7 +908,7 @@ class DeviceHandler:
             user_ids: The Matrix IDs of the users that have changed.
         """
         await self._notify_user_signature_update_client(
-            instance_name=random.choice(self._device_list_writers),
+            instance_name=self._device_list_writers[-1],  # TEMP
             from_user_id=from_user_id,
             user_ids=user_ids,
         )