diff --git a/synapse/storage/filtering.py b/synapse/storage/filtering.py
index a2ccc66ea..e7ec43cf9 100644
--- a/synapse/storage/filtering.py
+++ b/synapse/storage/filtering.py
@@ -51,6 +51,15 @@ class FilteringStore(SQLBaseStore):
         # Need an atomic transaction to SELECT the maximal ID so far then
         # INSERT a new one
         def _do_txn(txn):
+            sql = (
+                "SELECT filter_id FROM user_filters "
+                "WHERE user_id = ? AND filter_json = ?"
+            )
+            txn.execute(sql, (user_localpart,def_json))
+            filter_id = txn.fetchone()[0]
+            if filter_id is not None:
+                return filter_id
+
             sql = (
                 "SELECT MAX(filter_id) FROM user_filters "
                 "WHERE user_id = ?"