From 448c8574c73eae1efb009a6dfa9d7404f225310e Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 26 Apr 2023 12:57:37 -0400
Subject: [PATCH 1/2] Do not return experimental push rules by default.

---
 rust/src/push/mod.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs
index 575a1c1e682d..42c7c8413241 100644
--- a/rust/src/push/mod.rs
+++ b/rust/src/push/mod.rs
@@ -568,7 +568,10 @@ impl FilteredPushRules {
             .filter(|rule| {
                 // Ignore disabled experimental push rules
 
-                if !self.msc1767_enabled && rule.rule_id.contains("org.matrix.msc1767") {
+                if !self.msc1767_enabled
+                    && (rule.rule_id.contains("org.matrix.msc1767")
+                        || rule.rule_id.contains("org.matrix.msc3933"))
+                {
                     return false;
                 }
 

From c3964fcf9c0212d5fe32c0cea609a357bb9d13d7 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 26 Apr 2023 13:09:02 -0400
Subject: [PATCH 2/2] Newsfragment

---
 changelog.d/15494.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/15494.bugfix

diff --git a/changelog.d/15494.bugfix b/changelog.d/15494.bugfix
new file mode 100644
index 000000000000..89f9262200c9
--- /dev/null
+++ b/changelog.d/15494.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse 1.73.0 where some experimental push rules were returned by default.