Disabling offhand slot

I am making a mod that has more weapons, some of which are “two handed” and disable the offhand slot. My goal for theses is that the weapon is in the hand (triggers via the weapon trigger ”when in hand tick”). It saves the item in the offhand slot via player persistent variables, and then switches the offhand to an air block. However, what I’m struggling with is returning the saved item after the weapon is gone. I tried waiting a few ticks and then returning the item, but that just made it flahed in and out of the offhand slot, so instead I tried to make it wait a few ticks and then check again if the offhand is a tag “two handed weapons”, but then it just wouldn’t return the item at all. Any solutions?