diff --git a/database/migrations/2017_06_19_111515_update_dark_mode.php b/database/migrations/2017_06_19_111515_update_dark_mode.php
index 89535b722660..38b4a13ba853 100644
--- a/database/migrations/2017_06_19_111515_update_dark_mode.php
+++ b/database/migrations/2017_06_19_111515_update_dark_mode.php
@@ -17,6 +17,13 @@ class UpdateDarkMode extends Migration
         });
 
         DB::statement('update users set dark_mode = 1;');
+
+        // update invoice_item_type_id for task invoice items
+        DB::statement('update invoice_items
+            left join invoices on invoices.id = invoice_items.invoice_id
+            set invoice_item_type_id = 2
+            where invoices.has_tasks = 1
+            and invoice_item_type_id = 1');        
     }
 
     /**
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 131b85924077..b83ad7b3adea 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -166,11 +166,16 @@ function ViewModel(data) {
         }
     });
 
+    self.hasTasksCached;
     self.hasTasks = ko.computed(function() {
+        if (self.hasTasksCached) {
+            return true;
+        }
         invoice = self.invoice();
         for (var i=0; i<invoice.invoice_items().length; ++i) {
             var item = invoice.invoice_items()[i];
             if (! item.isEmpty() && item.invoice_item_type_id() == {{ INVOICE_ITEM_TYPE_TASK }}) {
+                self.hasTasksCached = true;
                 return true;
             }
         }