Sun Shafts with z buffer on flicker in Deferred mode

Pretty much what the title says... is there any way to correct this? I can turn the z-buffer checkbox off but then things get sun shafts through them even when they're behind geometry and mountains and stuff. If I switch to forward rendering the sun shafts stop flickering, but I need deferred for dual lightmaps.