diff --git a/neo/client/handlers/master.py b/neo/client/handlers/master.py
index 0fc24d13f8fc4cefab271a1fb8606eed5f84c0d1..77dc9e75f00224fdbc58bd2f72c983fd48a098e9 100644
--- a/neo/client/handlers/master.py
+++ b/neo/client/handlers/master.py
@@ -123,10 +123,8 @@ class PrimaryNotificationsHandler(BaseHandler):
             oids = {}
             for oid in oid_list:
                 oids[oid] = tid
-                try:
+                if oid in app.mq_cache:
                     del app.mq_cache[oid]
-                except KeyError:
-                    pass
             db = app.getDB()
             if db is not None:
                 db.invalidate(tid, oids)
diff --git a/neo/client/mq.py b/neo/client/mq.py
index d5aa4aa3b9a732c074df756b60e31e4d4a55977a..e3143db8b8d767357d755f4673e2671be3ab2be2 100644
--- a/neo/client/mq.py
+++ b/neo/client/mq.py
@@ -260,7 +260,7 @@ class MQ(object):
     __setitem__ = store
 
     def invalidate(self, key):
-        if id in self._data:
+        if key in self._data:
             data = self._data[key]
             if data.level >= 0:
                 del self._cache_buffers[data.level][data.element]