2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/16670.bugfix b/changelog.d/16670.bugfix
new file mode 100644
index 0000000000..f1369abc06
--- /dev/null
+++ b/changelog.d/16670.bugfix
@@ -0,0 +1 @@
+Consistently bypass rate limits when using the server notice admin API.
diff --git a/synapse/server_notices/server_notices_manager.py b/synapse/server_notices/server_notices_manager.py
index 9732dbdb6e..c3552d6c73 100644
--- a/synapse/server_notices/server_notices_manager.py
+++ b/synapse/server_notices/server_notices_manager.py
@@ -226,6 +226,7 @@ class ServerNoticesManager:
             target=UserID.from_string(user_id),
             room_id=room_id,
             action="invite",
+            ratelimit=False,
         )
 
     async def _update_notice_user_profile_if_changed(
@@ -268,5 +269,6 @@ class ServerNoticesManager:
                 target=UserID.from_string(self.server_notices_mxid),
                 room_id=room_id,
                 action="join",
+                ratelimit=False,
                 content={"displayname": display_name, "avatar_url": avatar_url},
             )