The first is correct. , until, when, after, before), it would be rare to find "will" in English, even though future time is obviously implied. Typically the "burden" of indicating future time with "will" or "won't" is carried by the main clause.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.