1031 exchange across 2 years - capital gains showing up on both years

[Lovethefarm2]

Started 1031 exchange late 2022 and finished in 2023.  All within deadline dates.  Was directed by CPA to amend 2022 return to show the 8824 form.  Once amended, showing big tax bill and capital gains on 2022.  Then, when declaring the gains in 2023 (4797) it too is calculating big tax bill for capital gains in 2023.  At a loss how to correctly report this and have spent hours on this.  Any ideas?  Should only the sale of the original property be on the 2022 and not the purchase of the new property?  Tax bill should not be calculated until all is complete.

[tagteam]

I'm going to page you Champ @Mike9241 for input here but Form 4797 is the wrong form.

Form 8824 is the proper form to report a 1031 exchange.