Having 1 6 B as a batch is the correct and normal way of doing things, and normally your model will keep the calculations for each element of the batch separated.
But as far as I can see your model does mix up the dimensions and end up merging the elements of the batch together.