diff --git a/api/models.py b/api/models.py
index 986bfd58..7c00981d 100644
--- a/api/models.py
+++ b/api/models.py
@@ -501,8 +501,8 @@ class Order(models.Model):
             4: 0,                                               # 'Cancelled'
             5: 0,                                               # 'Expired'
             6: int(self.escrow_duration),                       # 'Waiting for trade collateral and buyer invoice'
-            7: 60 * int(config("INVOICE_AND_ESCROW_DURATION")), # 'Waiting only for seller trade collateral'
-            8: 60 * int(config("INVOICE_AND_ESCROW_DURATION")), # 'Waiting only for buyer invoice'
+            7: int(self.escrow_duration),                       # 'Waiting only for seller trade collateral'
+            8: int(self.escrow_duration),                       # 'Waiting only for buyer invoice'
             9: 60 * 60 * int(config("FIAT_EXCHANGE_DURATION")), # 'Sending fiat - In chatroom'
             10: 60 * 60 * int(config("FIAT_EXCHANGE_DURATION")),# 'Fiat sent - In chatroom'
             11: 1 * 24 * 60 * 60,                               # 'In dispute'