diff --git a/odex25_realstate/property_management/models/rental_contract.py b/odex25_realstate/property_management/models/rental_contract.py
index c00144cdc..353d0f112 100644
--- a/odex25_realstate/property_management/models/rental_contract.py
+++ b/odex25_realstate/property_management/models/rental_contract.py
@@ -471,6 +471,12 @@ class RentalContract(models.Model):
 
     def action_draft(self):
         self.write({'state': 'draft'})
+        if self.unit_ids:
+            self.unit_ids.write({'state': 'available'})
+        elif self.property_id:
+            if self.property_id.state in ['reserve', 'rent']:
+                self.property_id.write({'state': 'approve'})
+                self.property_id.unit_ids.write({'state': 'available'})
 
     def action_cancel(self):
         if self.rent_payment_ids: