diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index f8413c9289..3c6937b7a7 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -39,7 +39,9 @@ public interface DaoFolder {
             " ORDER BY CASE WHEN folder.type = '" + EntityFolder.USER + "' THEN 1 ELSE 0 END")
     List<EntityFolder> getFolders(long account, boolean synchronize);
 
-    @Query("SELECT * FROM folder WHERE synchronize")
+    @Query("SELECT folder.* FROM folder" +
+            " JOIN account ON account.id = folder.account" +
+            " WHERE account.synchronize AND folder.synchronize")
     List<EntityFolder> getFoldersSynchronizing();
 
     @Query("SELECT folder.* FROM folder" +