Do not return extensible events experimental push rules by default. (#15494)

2 files changed, 5 insertions, 1 deletions

diff --git a/changelog.d/15494.bugfix b/changelog.d/15494.bugfix
new file mode 100644

index 0000000000..89f9262200
--- /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.
diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs

index 575a1c1e68..42c7c84132 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;
                 }