Plot Hole or Did I Miss Something? Rick's Original Body vs. Consciousness Transfer

So I was rewatching Rick and Morty, and I got confused about something and was hoping someone could clear it up.

In Season 3, Episode 1 (I think), Rick uses some kind of consciousness transfer device to hop from his own body into an insect from the Galactic Federation, and eventually into another Rick from the Citadel. So by the end of that whole sequence, Rick is walking around in a different Rick’s body, right?

Now jump ahead to Season 6—there’s that episode where everyone gets sent back to their original dimensions. But here’s my question: how does Rick get sent to his original dimension if he’s still using a different Rick’s body? Shouldn't the portal take him to the dimension of the body he's currently inhabiting, not his original mind's dimension?

Unless I missed something and he somehow got his original body back in between those seasons? Or maybe the portal gun tracks consciousness, not biology?

Would love to hear your thoughts. Is this a plot hole, or is there an explanation?