diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index a61d100d6b..6a2a1fccd5 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -422,6 +422,7 @@
 					{{ t('mail', 'Reply with meeting') }}
 				</ActionButton>
 				<ActionButton
+					v-if="tasksEnabled"
 					:close-after-click="true"
 					@click.prevent="showTaskModal = true">
 					<template #icon>
@@ -901,6 +902,10 @@ export default {
 			return this.mainStore.getMailbox(this.account.archiveMailboxId)
 		},
 
+		tasksEnabled() {
+			return this.mainStore.getTaskCalendarsForCurrentUser.length > 0
+		},
+
 		isSnoozedMailbox() {
 			return this.mailbox.databaseId === this.account.snoozeMailboxId
 		},
diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
index 5f989e5903..b5bbf77197 100644
--- a/src/components/MenuEnvelope.vue
+++ b/src/components/MenuEnvelope.vue
@@ -165,6 +165,7 @@
 				{{ t('mail', 'Reply with meeting') }}
 			</ActionButton>
 			<ActionButton
+				v-if="tasksEnabled"
 				:close-after-click="true"
 				@click.prevent="$emit('open-task-modal')">
 				<template #icon>
@@ -461,6 +462,10 @@ export default {
 			return mailboxHasRights(this.mailbox, 'te')
 		},
 
+		tasksEnabled() {
+			return this.mainStore.getTaskCalendarsForCurrentUser.length > 0
+		},
+
 		isSnoozedMailbox() {
 			return this.mailbox.databaseId === this.account.snoozeMailboxId
 		},