2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py
index f8c5bf18d4..adac1f0362 100644
--- a/synapse/rest/admin/rooms.py
+++ b/synapse/rest/admin/rooms.py
@@ -251,6 +251,10 @@ class ListRoomRestServlet(RestServlet):
         direction = parse_enum(request, "dir", Direction, default=Direction.FORWARDS)
         reverse_order = True if direction == Direction.BACKWARDS else False
 
+        emma_include_tombstone = parse_boolean(
+            request, "emma_include_tombstone", default=False
+        )
+
         # Return list of rooms according to parameters
         rooms, total_rooms = await self.store.get_rooms_paginate(
             start,
@@ -260,6 +264,7 @@ class ListRoomRestServlet(RestServlet):
             search_term,
             public_rooms,
             empty_rooms,
+            emma_include_tombstone = emma_include_tombstone
         )
 
         response = {
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
index 63ea52baf8..38230de0de 100644
--- a/synapse/rest/client/room.py
+++ b/synapse/rest/client/room.py
@@ -918,7 +918,6 @@ class RoomEventServlet(RestServlet):
                 request,
                 "fi.mau.msc2815.include_unredacted_content"
             )
-            == "true"
         )
         if include_unredacted_content and not await self.auth.is_server_admin(
             requester