diff --git a/etherlink/tezt/tests/evm_rollup.ml b/etherlink/tezt/tests/evm_rollup.ml
index 2947e32d73b484600c59a49ca99688be000148a6..4b34a5a0f84a9599f1d330ca824443a9009bdd6f 100644
--- a/etherlink/tezt/tests/evm_rollup.ml
+++ b/etherlink/tezt/tests/evm_rollup.ml
@@ -4928,7 +4928,8 @@ let test_l2_timestamp_opcode =
 let test_migrate_proxy_to_sequencer_future =
   Protocol.register_test
     ~__FILE__
-    ~tags:["evm"; "rollup_node"; "init"; "migration"; "sequencer"]
+    ~tags:
+      ["evm"; "rollup_node"; "init"; "migration"; "sequencer"; Tag.ci_disabled]
     ~uses:(fun _protocol ->
       [
         Constant.octez_smart_rollup_node;
diff --git a/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml b/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml
index 2c6cadbdb841f46ef8ffaf836b37388444f6fed1..89ad7948d5dfd9f45b2870569c0cc43d6e74872e 100644
--- a/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml
+++ b/src/proto_021_PsQuebec/lib_delegate/baking_scheduling.ml
@@ -528,9 +528,11 @@ let compute_next_timeout state : Baking_state.timeout_kind Lwt.t tzresult Lwt.t
     match round_proposer state ~level:`Current (snd next_round) with
     | Some _ ->
         let delta =
-          state.global_state.constants.parametric.minimal_block_delay
-          |> Period.to_seconds
-          |> fun d -> Int64.div d 5L
+          max
+            1L
+            ( state.global_state.constants.parametric.minimal_block_delay
+              |> Period.to_seconds
+            |> fun d -> Int64.div d 5L )
         in
         (* NB: this means 6 seconds delay, if the first round duration is
            30. *)
diff --git a/src/proto_alpha/lib_delegate/baking_scheduling.ml b/src/proto_alpha/lib_delegate/baking_scheduling.ml
index 5f868cbf5ce66386f5d7427122b029e8f43afd28..91590c9fa8ae058ded18833f2e74dbc6e671a5ef 100644
--- a/src/proto_alpha/lib_delegate/baking_scheduling.ml
+++ b/src/proto_alpha/lib_delegate/baking_scheduling.ml
@@ -531,9 +531,11 @@ let compute_next_timeout state : Baking_state.timeout_kind Lwt.t tzresult Lwt.t
     match round_proposer state ~level:`Current (snd next_round) with
     | Some _ ->
         let delta =
-          state.global_state.constants.parametric.minimal_block_delay
-          |> Period.to_seconds
-          |> fun d -> Int64.div d 5L
+          max
+            1L
+            ( state.global_state.constants.parametric.minimal_block_delay
+              |> Period.to_seconds
+            |> fun d -> Int64.div d 5L )
         in
         (* NB: this means 6 seconds delay, if the first round duration is
            30. *)