Mainstage 3 Hardware Synthesizer Midi patch change issue

I'm using MainStage 3 controlled by a Hardware synth to change patches on both MainStage and the Hardware Synth. I'm using both MainStage and Hardware Synth audio into an external mixer to use the best patches from both. I have synthesizer local off so the Hardware Synth has 16 buttons and sends Midi patch change messages to MainStage and MainStage translates these into the appropriate Hardware synth patch and sends the midi PC message back to Hardware Synth to change patches or just changes the MainStage patch accordingly. Configuring this way is cool since MainStage does not send the midi notes back to the Hardware synth so it's not playing when I only want to use the MainStage patch. Although I can control both with the hardware synth keyboard (i.e. midi local off).

I do it this way because most times the Midi PC message is just for MainStage to change patches and not send a Hardware Synth PC change, and in that case MainStage does not send the midi notes back to the hardware synth which is what I want.

The issue I'm having is that if for some reason I send the same midi patch change message from the hardware synth, that I sent previously; (i.e. right before) it seems that MainStage does not view this as a patch change so just reroutes the same PC message back to the Hardware Synth without translation and I get the actual Hardware synthesizer patch for that midi PC command which I do not want.

It would be better for MainStage to just process this as a new request and resend the translated Midi PC like it would do for an actual patch change.

Does anyone know of any MainStage configuration solutions to prevent this?