I always use a comma before then when it means in that case and ends the sentence. The comma serves to forestall any misinterpretation of the meaning of the word.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.
SnarfThere is no way that it can mean "at that time," no way.Still. Why not keep things simple and consistent?