Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py

index a14f0c807e..b5a6d6aebf 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -84,7 +84,8 @@ class PresenceStatusRestServlet(ClientV1RestServlet):
         except Exception:
             raise SynapseError(400, "Unable to parse state")
 
-        yield self.presence_handler.set_state(user, state)
+        if self.hs.config.use_presence:
+            yield self.presence_handler.set_state(user, state)
 
         defer.returnValue((200, {}))