diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
index 4f466e5ba..02de16a17 100644
--- a/lib/ui/invoice/edit/invoice_edit_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -250,7 +250,8 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
         .length;
 
     final showTasksTable =
-        invoice.hasTasks || (company.showTasksTable ?? false);
+        (invoice.hasTasks || (company.showTasksTable ?? false)) &&
+            (invoice.isInvoice || invoice.isQuote);
 
     final settings = getClientSettings(state, client);
     final terms = entityType == EntityType.quote
@@ -601,7 +602,7 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                     ),
                   ],
                 ),
-                if (invoice.isInvoice && showTasksTable)
+                if (showTasksTable)
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 18),
                     child: AppTabBar(
@@ -640,7 +641,7 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                 if (entityType == EntityType.credit)
                   CreditEditItemsScreen(
                     viewModel: widget.entityViewModel,
-                    isTasks: _selectTasksTable && showTasksTable,
+                    isTasks: _selectTasksTable,
                   )
                 else if (entityType == EntityType.quote)
                   QuoteEditItemsScreen(
@@ -649,7 +650,7 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                 else if (entityType == EntityType.invoice)
                   InvoiceEditItemsScreen(
                     viewModel: widget.entityViewModel,
-                    isTasks: _selectTasksTable && showTasksTable,
+                    isTasks: _selectTasksTable,
                   )
                 else if (entityType == EntityType.recurringInvoice)
                   RecurringInvoiceEditItemsScreen(