What to wear under swaddle?

[Huishnish]

Could anyone advise me about what to dress my baby (13 weeks) in under the swaddle in this heat? It's about 23 degrees in my room and he really can't sleep without the swaddle (I'm using a summer infant swaddle me - thin cotton). Do you think it's safe to swaddle if he's wearing just a nappy? Totally paranoid about him getting too hot

I have been putting my 14 week twins in just a nappy with their SwaddleMe summer infant swaddles when it's been warm but the past few nights they've just slept in nappies no swaddles, its soooooo hot here

I am using the same summer infant swaddleme with just a nappy underneath on DS (5 weeks), although we have a fan on too.