diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
index 15d98198e2b1c6fa9e863400d1b063a42367d441..9b136f311936c8188e86241bb44811eac8ee6b75 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -21,12 +21,15 @@ from twisted.internet import defer
 
 class PresenceStore(SQLBaseStore):
     def create_presence(self, user_localpart):
-        return self._simple_insert(
+        res = self._simple_insert(
             table="presence",
             values={"user_id": user_localpart},
             desc="create_presence",
         )
 
+        self.get_presence_state.invalidate((user_localpart,))
+        return res
+
     def has_presence_state(self, user_localpart):
         return self._simple_select_one(
             table="presence",
@@ -65,7 +68,7 @@ class PresenceStore(SQLBaseStore):
         return self.runInteraction("get_presence_states", f)
 
     def set_presence_state(self, user_localpart, new_state):
-        return self._simple_update_one(
+        res = self._simple_update_one(
             table="presence",
             keyvalues={"user_id": user_localpart},
             updatevalues={"state": new_state["state"],
@@ -74,6 +77,9 @@ class PresenceStore(SQLBaseStore):
             desc="set_presence_state",
         )
 
+        self.get_presence_state.invalidate((user_localpart,))
+        return res
+
     def allow_presence_visible(self, observed_localpart, observer_userid):
         return self._simple_insert(
             table="presence_allow_inbound",