Swaddling Question

An

Ok, this going to sound a little stupid, but if I swaddle my 3 month old for nap time, will he still sleep through the night swaddled? I'm just afraid he'll associate the swaddle with nap time and wake up at night then. He's slept through the night since about 3 weeks when swaddled but he's getting to the point he won't take any naps during the day because he startles so much.