How old is your son and what time does he go to sleep at night?
For my mea, she's 4 mths, her night sleep usually starts at 9pm, wake up at 1am feed, sleep again, wake at 5am to feed, then sleep again till 7.30am - 8am. I still swaddle her because she sleeps better with than without. I tried to let her sleep without her swaddle 2 days ago and she woke up every 2 - 3 hours. Gave me a big headache.
I have a 21 month old as well, misha, and she sleeps by 9pm and wakes up at 7.30 - 8.30am.
The key to not creating bad sleeping habits for your child is to never play with them during night time. No matter how hard they cry, you can console them but dont't talk to them and engage them in a conversation. Eventually they will know that it is night time and mommy is not going to play no matter what.
On top of that, having an uninterrupted bedtime routine is crucial. Whatever that you do with him half an hour before he goes to bed, make that your routine. Children love routine but just dont't know it yet.