diff --git a/packages/server/folder/folder.schema.js b/packages/server/folder/folder.schema.js
index 8a311f1b..729a9fdb 100644
--- a/packages/server/folder/folder.schema.js
+++ b/packages/server/folder/folder.schema.js
@@ -47,4 +47,6 @@ FolderSchema.virtual('childFolders', {
   justOne: false,
 });
 
+FolderSchema.index({ _parentFolder: 1 });
+
 module.exports = FolderSchema;
diff --git a/packages/server/mailing/mailing.schema.js b/packages/server/mailing/mailing.schema.js
index 30f2be24..7185633e 100644
--- a/packages/server/mailing/mailing.schema.js
+++ b/packages/server/mailing/mailing.schema.js
@@ -166,6 +166,7 @@ MailingSchema.index({ _company: 1, tags: 1 });
 MailingSchema.index({ _company: 1, _parentFolder: 1, updatedAt: -1 });
 MailingSchema.index({ _company: 1, _workspace: 1, updatedAt: -1 });
 MailingSchema.index({ _user: 1 });
+MailingSchema.index({ _parentFolder: 1 });
 
 MailingSchema.statics.findForApi = async function findForApi(query = {}) {
   return this.find(query, { previewHtml: 0, data: 0 });