diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index 508ddb25e..440591d36 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -11,7 +11,7 @@
 
 {
     "name": "Recurring - Contracts Management",
-    "version": "15.0.1.5.3",
+    "version": "15.0.1.5.4",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",
diff --git a/contract/models/contract_recurrency_mixin.py b/contract/models/contract_recurrency_mixin.py
index 20dc0c507..aebc76c3f 100644
--- a/contract/models/contract_recurrency_mixin.py
+++ b/contract/models/contract_recurrency_mixin.py
@@ -110,7 +110,11 @@ class ContractRecurrencyMixin(models.AbstractModel):
                 next_period_date_start = rec.last_date_invoiced + relativedelta(days=1)
             else:
                 next_period_date_start = rec.date_start
-            if rec.date_end and next_period_date_start > rec.date_end:
+            if (
+                rec.date_end
+                and next_period_date_start
+                and next_period_date_start > rec.date_end
+            ):
                 next_period_date_start = False
             rec.next_period_date_start = next_period_date_start