diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 8de87e02a2a5..1f8c27449912 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -97,11 +97,7 @@ class BaseModel extends Model
 
     public function dateMutator($value)
     {
-        if (! empty($value)) {
-            return (new Carbon($value))->format('Y-m-d');
-        }
-
-        return $value;
+        return (new Carbon($value))->format('Y-m-d');
     }
 
     // public function __call($method, $params)
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 2d9a5babc397..ef82156fa61e 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -245,6 +245,9 @@ class Invoice extends BaseModel
 
     public function getPartialDueDateAttribute($value)
     {
+        if($value == "0000-00-00 00:00:00")
+            return null;
+
         return $this->dateMutator($value);
     }
 
@@ -396,7 +399,7 @@ class Invoice extends BaseModel
     public function getStatusAttribute()
     {
         $due_date = $this->due_date ? Carbon::parse($this->due_date) : false;
-        $partial_due_date = $this->partial_due_Date ? Carbon::parse($this->partial_due_date) : false;
+        $partial_due_date = $this->partial_due_date ? Carbon::parse($this->partial_due_date) : false;
 
         if ($this->status_id == self::STATUS_SENT && $due_date && $due_date->gt(now())) {
             return self::STATUS_UNPAID;
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index 85605ed37485..455568a0ca15 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -132,7 +132,7 @@ class InvoiceTransformer extends EntityTransformer
             'is_amount_discount' => (bool) ($invoice->is_amount_discount ?: false),
             'footer' => $invoice->footer ?: '',
             'partial' => (float) ($invoice->partial ?: 0.0),
-            'partial_due_date' => $invoice->partial_due_date ?: '',
+            'partial_due_date' => ($invoice->partial_due_date && $invoice->partial_due_date != "-0001-11-30") ?: '',
             'custom_value1' => (string) $invoice->custom_value1 ?: '',
             'custom_value2' => (string) $invoice->custom_value2 ?: '',
             'custom_value3' => (string) $invoice->custom_value3 ?: '',