From e2e9b545ff884627f7605c3d6519e46de33b83fe Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 26 Apr 2023 14:27:38 -0400
Subject: [PATCH] Do not return extensible events experimental push rules by
 default. (#15494)

---
 changelog.d/15494.bugfix | 1 +
 rust/src/push/mod.rs     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/15494.bugfix

diff --git a/changelog.d/15494.bugfix b/changelog.d/15494.bugfix
new file mode 100644
index 000000000..89f926220
--- /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 575a1c1e6..42c7c8413 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;
                 }