diff --git a/optimism/op-node/rollup/engine/engine_controller.go b/optimism/op-node/rollup/engine/engine_controller.go
index 6fee5c51c..2a3057a92 100644
--- a/optimism/op-node/rollup/engine/engine_controller.go
+++ b/optimism/op-node/rollup/engine/engine_controller.go
@@ -141,8 +141,7 @@ func (e *EngineController) BackupUnsafeL2Head() eth.L2BlockRef {
 }
 
 func (e *EngineController) IsEngineSyncing() bool {
-	// return e.syncStatus == syncStatusWillStartEL || e.syncStatus == syncStatusStartedEL || e.syncStatus == syncStatusFinishedELButNotFinalized
-	return true
+	return e.syncStatus == syncStatusWillStartEL || e.syncStatus == syncStatusStartedEL || e.syncStatus == syncStatusFinishedELButNotFinalized
 }
 
 // Setters
diff --git a/optimism/op-node/rollup/engine/events.go b/optimism/op-node/rollup/engine/events.go
index 22ec9dce6..c29b7c44c 100644
--- a/optimism/op-node/rollup/engine/events.go
+++ b/optimism/op-node/rollup/engine/events.go
@@ -437,6 +437,7 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 			"unsafe_timestamp", x.Unsafe.Time)
 		d.emitter.Emit(EngineResetConfirmedEvent(x))
 	case PromoteUnsafeEvent:
+		d.preconfChannels.SendL2Block(&x.Ref)
 		// Backup unsafeHead when new block is not built on original unsafe head.
 		if d.ec.unsafeHead.Number >= x.Ref.Number {
 			d.ec.SetBackupUnsafeL2Head(d.ec.unsafeHead, false)
@@ -498,7 +499,6 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 			d.emitter.Emit(PromoteSafeEvent(x))
 		}
 	case PromoteSafeEvent:
-		d.preconfChannels.SendL2Block(&x.Ref)
 		d.log.Debug("Updating safe", "safe", x.Ref, "unsafe", d.ec.UnsafeL2Head())
 		d.ec.SetSafeHead(x.Ref)
 		// Finalizer can pick up this safe cross-block now