When choosing side arm and throw ammo crate your reverted back to main weapon

Hey all,

Just to be clear here; at the moment, when you have your sidearm equipped and you switch to your health/ammo create to deploy them, and switch back, it automatically selects your primary gun instead of your last used firearm?