Seems to be the same problem I encountered ( HHH-11766 Open ).
A patch that fixed the issue for us is attached there, although we did decide against using a patched fork and are using a workaround for now.