From 49cf205dc715608e45b9a47a250e7921d1836912 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 19 Sep 2016 10:34:01 +0100
Subject: [PATCH] _id field must uniquely identify different conditions

---
 synapse/push/baserules.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 6454fe738..85effdfa4 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -305,7 +305,7 @@ BASE_APPEND_UNDERRIDE_RULES = [
                 'kind': 'event_match',
                 'key': 'type',
                 'pattern': 'm.room.encrypted',
-                '_id': '_message',
+                '_id': '_encrypted',
             }
         ],
         'actions': [
@@ -345,7 +345,7 @@ BASE_APPEND_UNDERRIDE_RULES = [
                 'kind': 'event_match',
                 'key': 'type',
                 'pattern': 'm.room.encrypted',
-                '_id': '_message',
+                '_id': '_encrypted',
             }
         ],
         'actions': [