Yes, there is never any good reason to omit the comma in these instances. Also, then is optional in conditional clauses, especially in sentences as short as your example.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.