diff --git a/src/components/MailboxThread.vue b/src/components/MailboxThread.vue
index d378126346..d2ccec23b2 100644
--- a/src/components/MailboxThread.vue
+++ b/src/components/MailboxThread.vue
@@ -317,7 +317,8 @@ export default {
 	},
 	methods: {
 		async fetchEnvelopes() {
-			if (!this.hasEnvelopes) {
+			const existingEnvelopes = this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.searchQuery || '')
+			if (!existingEnvelopes.length) {
 				await this.$store.dispatch('fetchEnvelopes', {
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery || '',