Merge remote-tracking branch 'origin/develop' into mv/unbind-callback

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/rest/client/user_directory.py b/synapse/rest/client/user_directory.py

index 116c982ce6..4670fad608 100644
--- a/synapse/rest/client/user_directory.py
+++ b/synapse/rest/client/user_directory.py
@@ -63,8 +63,8 @@ class UserDirectorySearchRestServlet(RestServlet):
 
         body = parse_json_object_from_request(request)
 
-        limit = body.get("limit", 10)
-        limit = min(limit, 50)
+        limit = int(body.get("limit", 10))
+        limit = max(min(limit, 50), 0)
 
         try:
             search_term = body["search_term"]