diff --git a/app/src/main/java/eu/faircode/email/DaoAnswer.java b/app/src/main/java/eu/faircode/email/DaoAnswer.java
index f89754c2b0..77cdd10bfb 100644
--- a/app/src/main/java/eu/faircode/email/DaoAnswer.java
+++ b/app/src/main/java/eu/faircode/email/DaoAnswer.java
@@ -61,10 +61,10 @@ public interface DaoAnswer {
     @Update
     int updateAnswer(EntityAnswer answer);
 
-    @Query("UPDATE answer SET hide = :hide WHERE id = :id")
+    @Query("UPDATE answer SET hide = :hide WHERE id = :id AND hide <> :hide")
     int setAnswerHidden(long id, boolean hide);
 
-    @Query("UPDATE answer SET standard = 0")
+    @Query("UPDATE answer SET standard = 0 WHERE standard <> 0")
     void resetStandard();
 
     @Query("DELETE FROM answer WHERE id = :id")