diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index d256b86ce5..993499f446 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -127,7 +127,8 @@ class DeviceWorkerHandler(BaseHandler):
         )
 
         tracked_users = set(users_who_share_room)
-        # always tell the user about their own devices
+
+        # Always tell the user about their own devices
         tracked_users.add(user_id)
 
         changed = yield self.store.get_users_whose_devices_changed(
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 725f41c4d9..1f1cde2feb 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1144,6 +1144,8 @@ class SyncHandler(object):
             )
 
             tracked_users = set(users_who_share_room)
+
+            # Always tell the user about their own devices
             tracked_users.add(user_id)
 
             # Step 1a, check for changes in devices of users we share a room with