diff --git a/app/Helpers/Invoice/InvoiceCalc.php b/app/Helpers/Invoice/InvoiceCalc.php
index a343362b50d1..f8b45cbc332a 100644
--- a/app/Helpers/Invoice/InvoiceCalc.php
+++ b/app/Helpers/Invoice/InvoiceCalc.php
@@ -194,7 +194,8 @@ class InvoiceCalc
 	 */
 	private function calcLineItems()
 	{
-		if(!$this->invoice->line_items || !property_exists($this->invoice, 'line_items') || count($this->invoice->line_items) == 0)
+		//if(!$this->invoice->line_items || !property_exists($this->invoice, 'line_items') || count($this->invoice->line_items) == 0)
+		if(!$this->invoice->line_items || count($this->invoice->line_items) == 0)
 			return $this;
 
 		$new_line_items = [];
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 0b8dc6b00881..a69cb879f373 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -48,6 +48,7 @@ class StoreInvoiceRequest extends Request
         $input = $this->all();
 
         $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
+        $input['line_items'] = isset($input['line_items']) ?: [];
 
         $this->replace($input);
 
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index 8149fe3b0866..49edcf93e486 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -42,15 +42,6 @@ class UpdateInvoiceRequest extends Request
             //'invoice_type_id' => 'integer',
         ];
     }
-    
-    public function sanitize()
-    {
-        $input = $this->all();
-
-        //        $this->replace($input);
-
-        return $this->all();
-    }
 
     public function sanitize()
     {
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 1f39a49d3b01..8e7074d9eaa8 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -283,8 +283,8 @@ trait MakesInvoiceValues
 
     		$columns = $this->transformColumnsForLineItems($columns);
 
-            if(!is_array($this->line_items));
-                return $data;
+            //if(!is_array($this->line_items));
+            //    return $data;
 
     		$items = $this->transformLineItems($this->line_items);
 
diff --git a/tests/Integration/UpdateCompanyLedgerTest.php b/tests/Integration/UpdateCompanyLedgerTest.php
index b3d48b300b2d..8130f1983a3d 100644
--- a/tests/Integration/UpdateCompanyLedgerTest.php
+++ b/tests/Integration/UpdateCompanyLedgerTest.php
@@ -46,7 +46,6 @@ class UpdateCompanyLedgerTest extends TestCase
                                 ->first();
 
         $payment = $ledger->adjustment * -1;
-
         $this->assertEquals($invoice->amount, $payment);
 
     }
@@ -57,10 +56,11 @@ class UpdateCompanyLedgerTest extends TestCase
      */
     public function testInvoiceIsPresentInLedger()
     {
-        $this->invoice->save();
+        //$this->invoice->save();
 
         $ledger = CompanyLedger::whereCompanyLedgerableId($this->invoice->id)
                                     ->whereCompanyLedgerableType(Invoice::class)
+                                    ->whereCompanyId($this->invoice->company_id)
                                     ->get();
 
         $this->assertEquals(1, count($ledger));