diff --git a/changelog.d/8181.misc b/changelog.d/8181.misc
new file mode 100644
index 000000000000..a39e9eab46cd
--- /dev/null
+++ b/changelog.d/8181.misc
@@ -0,0 +1 @@
+Remove unused `is_guest` parameter from, and add safeguard to, `MessageHandler.get_room_data`.
\ No newline at end of file
diff --git a/tests/rest/client/test_shadow_banned.py b/tests/rest/client/test_shadow_banned.py
index 3eb9aeaa9eab..813ffa81d352 100644
--- a/tests/rest/client/test_shadow_banned.py
+++ b/tests/rest/client/test_shadow_banned.py
@@ -223,11 +223,7 @@ def test_displayname(self):
         message_handler = self.hs.get_message_handler()
         event = self.get_success(
             message_handler.get_room_data(
-                self.banned_user_id,
-                room_id,
-                "m.room.member",
-                self.banned_user_id,
-                False,
+                self.banned_user_id, room_id, "m.room.member", self.banned_user_id,
             )
         )
         self.assertEqual(
@@ -260,11 +256,7 @@ def test_room_displayname(self):
         message_handler = self.hs.get_message_handler()
         event = self.get_success(
             message_handler.get_room_data(
-                self.banned_user_id,
-                room_id,
-                "m.room.member",
-                self.banned_user_id,
-                False,
+                self.banned_user_id, room_id, "m.room.member", self.banned_user_id,
             )
         )
         self.assertEqual(