diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index a0622868b..b59fc8a11 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -220,7 +220,6 @@ final class BeanDescriptorCacheHelp<T> {
    */
   private void queryCacheClear(CacheChangeSet changeSet) {
     if (queryCache != null) {
-      changeSet.addInvalidate(desc);
       changeSet.addClearQuery(desc);
     }
   }
@@ -910,12 +909,11 @@ final class BeanDescriptorCacheHelp<T> {
       return;
     }
     changeSet.addInvalidate(desc);
+    changeSet.addClearQuery(desc);
     // inserts don't invalidate the bean cache
     if (tableIUD.isUpdateOrDelete()) {
       changeSet.addClearBean(desc);
     }
-    // any change invalidates the query cache
-    changeSet.addClearQuery(desc);
     // any change invalidates the collection IDs cache
     for (BeanPropertyAssocOne<?> imported : propertiesOneImported) {
       imported.cacheClear(changeSet);
diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index d7d24eefc..bb1690bfe 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -128,7 +128,6 @@ public class BeanPersistIds implements BinaryWritable {
    * Notify the cache of this event that came from another server in the cluster.
    */
   public void notifyCache(CacheChangeSet changeSet) {
-    changeSet.addInvalidate(beanDescriptor);
     changeSet.addClearQuery(beanDescriptor);
     if (ids != null) {
       changeSet.addBeanRemoveMany(beanDescriptor, ids);