chore: account for early exit and stop timer (#1895)

chore: account for early exit and stop timer (#1895) #6298