diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 2da8e72603a6..28ca431c9e31 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -63,7 +63,7 @@ class StoreInvoiceRequest extends Request
     protected function prepareForValidation()
     {
         $input = $this->all();
-
+nlog($input);
         $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index 7156974c233c..84994bc99542 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -97,7 +97,9 @@ class UpdateRecurringInvoiceRequest extends Request
             }
         }
 
-        $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        if (isset($input['line_items'])) {
+            $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        }
 
         if (isset($input['auto_bill'])) {
             $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index b6c67eeb1bc7..aca29955edbb 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -70,10 +70,10 @@ class Credit extends BaseModel
         'custom_surcharge2',
         'custom_surcharge3',
         'custom_surcharge4',
-        'custom_surcharge_tax1',
-        'custom_surcharge_tax2',
-        'custom_surcharge_tax3',
-        'custom_surcharge_tax4',
+        // 'custom_surcharge_tax1',
+        // 'custom_surcharge_tax2',
+        // 'custom_surcharge_tax3',
+        // 'custom_surcharge_tax4',
         'design_id',
         'assigned_user_id',
         'exchange_rate',
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 48342fd68aa8..177137e13409 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -84,10 +84,10 @@ class Invoice extends BaseModel
         'custom_surcharge2',
         'custom_surcharge3',
         'custom_surcharge4',
-        'custom_surcharge_tax1',
-        'custom_surcharge_tax2',
-        'custom_surcharge_tax3',
-        'custom_surcharge_tax4',
+    // 'custom_surcharge_tax1',
+    // 'custom_surcharge_tax2',
+    // 'custom_surcharge_tax3',
+    // 'custom_surcharge_tax4',
         'design_id',
         'assigned_user_id',
         'exchange_rate',
@@ -103,10 +103,6 @@ class Invoice extends BaseModel
         'updated_at' => 'timestamp',
         'created_at' => 'timestamp',
         'deleted_at' => 'timestamp',
-        'custom_surcharge_tax1' => 'bool',
-        'custom_surcharge_tax2' => 'bool',
-        'custom_surcharge_tax3' => 'bool',
-        'custom_surcharge_tax4' => 'bool',
     ];
 
     protected $with = [];
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 23992250887e..aa9720a505a5 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -71,10 +71,10 @@ class Quote extends BaseModel
         'custom_surcharge2',
         'custom_surcharge3',
         'custom_surcharge4',
-        'custom_surcharge_tax1',
-        'custom_surcharge_tax2',
-        'custom_surcharge_tax3',
-        'custom_surcharge_tax4',
+        // 'custom_surcharge_tax1',
+        // 'custom_surcharge_tax2',
+        // 'custom_surcharge_tax3',
+        // 'custom_surcharge_tax4',
         'design_id',
         'assigned_user_id',
         'exchange_rate',