Until how many weeks did you swaddle your baby?

My first born (girl) didn't get swaddled past 3 weeks, maybe because she was in the NICU for about that long. Now I have an 11 week old boy (born at 35weeks) and he started getting out of his swaddle at 9 weeks old so we started letting him sleep in just one of those sack blankets but I still see him jumping/jerk from time to time, makes me wonder if he'll be better off getting swaddled for a bit longer. He doesn't roll over yet.