diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
index d3f286ac28a..d40ab696336 100644
--- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
+++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
@@ -2357,7 +2357,7 @@ calculateLeiosMetrics ::
 calculateLeiosMetrics lm@LeiosMetrics {..} _lc (TraceLeiosAnnouncementAccepted _ _ fields (Just annDelay)) =
     case announcementElection fields of
       MkElId slotNo@(SlotNo slotNo_) _ ->
-        if Cdf.null lmCdfState
+        if Cdf.null lmCdfState && annDelay > 20 -- During startup wait until we are in sync
           then nothingToDo
           else
             case Cdf.processDataPoint
@@ -2368,7 +2368,10 @@ calculateLeiosMetrics lm@LeiosMetrics {..} _lc (TraceLeiosAnnouncementAccepted _
                    of
               Nothing -> nothingToDo
               Just (lm', lmCdfState') ->
-                lm' { lmCdfState    = lmCdfState'
+                lm' { lmCdfState  = lmCdfState'
+                    , lmTraceIt   = True
+                    , lmTraceVars = Cdf.size lmCdfState' >= 45 -- wait until we have at least 45 samples before providing cdf estimates
+                    , lmDelay     = realToFrac annDelay
                     }
   where
     nothingToDo = lm {lmTraceIt = False}