diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 9bd941b5a0..5e26af1a1a 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -129,7 +129,7 @@ class DeviceWorkerHandler(BaseHandler):
         tracked_users = set(users_who_share_room)
 
         # Always tell the user about their own devices
-        tracked_users.add(user_id)
+        #tracked_users.add(user_id)
 
         changed = yield self.store.get_users_whose_devices_changed(
             from_token.device_list_key, tracked_users
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 00718d7f2d..ed4e2961c8 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1148,7 +1148,7 @@ class SyncHandler(object):
             # rooms) and taking a copy of the set is relatively expensive.
             if user_id not in users_who_share_room:
                 users_who_share_room = set(users_who_share_room)
-                users_who_share_room.add(user_id)
+                #users_who_share_room.add(user_id)
 
             tracked_users = users_who_share_room