diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 6e114d542d..f0d7b34682 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -166,7 +166,7 @@ class PresenceHandler(BaseHandler):
                 observed_user=target_user
             )
 
-            if visible or True: # XXX: FIXME: Bodge to unbreak everything
+            if visible or True: # XXX: FIXME: Bodge to unbreak matrix.org. breaks UTs.
                 state = yield self.store.get_presence_state(
                     target_user.localpart
                 )