Merge tag 'v0.34.0rc1' into matrix-org-hotfixes

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py

index 80e7b15de8..ec936bbb4e 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -50,6 +50,9 @@ class SearchHandler(BaseHandler):
             dict to be returned to the client with results of search
         """
 
+        if not self.hs.config.enable_search:
+            raise SynapseError(400, "Search is disabled on this homeserver")
+
         batch_group = None
         batch_group_key = None
         batch_token = None