diff --git a/daemon/src/maker_cfd.rs b/daemon/src/maker_cfd.rs
index f5dc89d..2941202 100644
--- a/daemon/src/maker_cfd.rs
+++ b/daemon/src/maker_cfd.rs
@@ -751,7 +751,7 @@ where
         let dlc = cfd.open_dlc().context("CFD was in wrong state")?;
 
         let oracle_event_id =
-            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + Order::TERM)?;
+            oracle::next_announcement_after(time::OffsetDateTime::now_utc() + cfd.order.term)?;
         let announcement = self
             .oracle_actor
             .send(oracle::GetAnnouncement(oracle_event_id))
diff --git a/daemon/src/taker_cfd.rs b/daemon/src/taker_cfd.rs
index 695f51e..f2a98ae 100644
--- a/daemon/src/taker_cfd.rs
+++ b/daemon/src/taker_cfd.rs
@@ -340,6 +340,8 @@ where
             anyhow::bail!("An update for order id {} is already in progress", order_id)
         }
 
+        let order = load_order_by_id(order_id, &mut self.db.acquire().await?).await?;
+
         let proposal = RollOverProposal {
             order_id,
             timestamp: SystemTime::now(),
@@ -357,7 +359,7 @@ where
         // we are likely going to need this one
         self.oracle_actor
             .send(oracle::FetchAnnouncement(oracle::next_announcement_after(
-                OffsetDateTime::now_utc() + Order::TERM,
+                OffsetDateTime::now_utc() + order.term,
             )?))
             .await?;