diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 9f9257029e..ac6d1107bf 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -546,6 +546,7 @@ class PresenceHandler(object):
                 updates.append(prev_state.copy_and_replace(
                     last_user_sync_ts=time_now_ms,
                 ))
+                process_presence.discard(user_id)
 
             if updates:
                 yield self._update_states(updates)