diff --git a/src/proto_alpha/lib_delegate/client_baking_forge.ml b/src/proto_alpha/lib_delegate/client_baking_forge.ml
index e6c31d213..6fbec9db2 100644
--- a/src/proto_alpha/lib_delegate/client_baking_forge.ml
+++ b/src/proto_alpha/lib_delegate/client_baking_forge.ml
@@ -648,6 +648,8 @@ let create
         (* event matching *)
       | `Hash (None | Some (Error _)) ->
           (* return to restart *)
+          Lwt.cancel timeout ;
+          last_get_block := None ;
           Lwt.return_unit
 
       | `Hash (Some (Ok bi)) -> begin