diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
index 7727ae8c4..0c624e283 100644
--- a/lib/redux/task/task_selectors.dart
+++ b/lib/redux/task/task_selectors.dart
@@ -35,7 +35,9 @@ InvoiceItemEntity convertTaskToInvoiceItem({
   }
   lineBreak += '\n';
 
-  if (project.isOld && includeProjectHeader) {
+  if (company.invoiceTaskProjectHeader &&
+      project.isOld &&
+      includeProjectHeader) {
     if (state.company.markdownEnabled) {
       notes += '## ${project.name}\n';
     } else {
@@ -161,6 +163,10 @@ InvoiceItemEntity convertTaskToInvoiceItem({
   return InvoiceItemEntity().rebuild((b) => b
     ..typeId = InvoiceItemEntity.TYPE_TASK
     ..taskId = task.id
+    ..productKey =
+        company.invoiceTaskProject && !company.invoiceTaskProjectHeader
+            ? project.name
+            : ''
     ..notes = notes
     ..cost = taskRateSelector(
       company: company,