ETH2 Cost Basis Wrong

I staked about 25% of my Ethereum on Coinbase. Now, on the performance tab, my cost basis for ETH is wrong (too high) and cost basis for the ETH2 is showing as 0. I rely on that cost basis information in my day trading and as it is wrong, I’m unable to use it at all.

Screenshot_20210528-092209_Chrome

Also keeping an eye on this here Coinbase ETH2 Staking - #16 by matlas