Inconsistent Light Shafts intensity with HDR Skybox

Hello. I’ve got a problem with light shafts when using a HDRI for the skybox. There is a strong beam coming out of the sun position on the skybox and it looks weird. Removing the skybox seems to solve the problem. Is there a way to get rid of it without removing hdri skybox or light shafts?

Still can’t figure this one out. Brightness contrast between sun and the surroundings seems to be causing the issue. Tunning down sun brightness on the hdri seems to be solving the problem but makes it look worse. Could anyone help me solve this problem?

same issue here still. Makes using HDRI’s impossible to use with light shafts.