diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index ea1e525769..00cad23791 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -100,7 +100,10 @@ function setRoomNotifsStateUnmuted(roomId, newState) {
     }
 
     if (newState == 'all_messages') {
-        promises.push(cli.deletePushRule('global', 'room', roomId));
+        const roomRule = cli.getRoomPushRule('global', roomId);
+        if (roomRule) {
+            promises.push(cli.deletePushRule('global', 'room', roomRule.rule_id));
+        }
     } else if (newState == 'mentions_only') {
         promises.push(cli.addPushRule('global', 'room', roomId, {
             actions: [