diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 7caff48b7cf2..ef44a83ad805 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -117,6 +117,10 @@ class CheckData extends Command
 
         $this->logMessage(count($invoices) . ' draft sent invoices');
 
+        if (count($invoices) > 0) {
+            $this->isValid = false;
+        }
+
         if ($this->option('fix') == 'true') {
             foreach ($invoices as $invoice) {
                 if ($invoice->is_deleted) {
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 612c9f60c00f..4f65b1ea460d 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -412,12 +412,14 @@ class InvoiceRepository extends BaseRepository
             $invoice->invoice_date = Utils::toSqlDate($data['invoice_date']);
         }
 
+        /*
         if (isset($data['invoice_status_id'])) {
             if ($data['invoice_status_id'] == 0) {
                 $data['invoice_status_id'] = INVOICE_STATUS_DRAFT;
             }
             $invoice->invoice_status_id = $data['invoice_status_id'];
         }
+        */
 
         if ($invoice->is_recurring) {
             if (! $isNew && isset($data['start_date']) && $invoice->start_date && $invoice->start_date != Utils::toSqlDate($data['start_date'])) {