diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
index 8140c0b9d4..7f1efe2b46 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -84,7 +84,9 @@ class SearchHandler(BaseHandler):
     def search(self, user, content):
         try:
             search_term = content["search_categories"]["room_events"]["search_term"]
-            keys = content["search_categories"]["room_events"]["keys"]
+            keys = content["search_categories"]["room_events"].get("keys", [
+                "content.body", "content.name", "content.topic",
+            ])
         except KeyError:
             raise SynapseError(400, "Invalid search query")