I would say that both are correct, but the first is quite "fussy". I prefer the second. What is "correct" with regard to punctuation quite often depends on the style manual you are using.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.