Weapon switch after revive – anyone else notice this?

So I was playing the BF6 open beta as Assault with a sniper + carbine setup, and I ran into something that kept getting me killed. When I pushing up close, usually rocking the carbine. If I go down while holding it, and someone revives me, I pop back up holding my sniper instead. A couple times this completely threw me off, since I was expecting my carbine ready to go but ended up scoped in on someone 5 feet away not ideal. Happened to me pretty consistently. Anyone else run into this? Would be nice if it remembered the weapon you were using when you went down.