Visa required for a 3 hour flight transit in Shanghai ?

Hi, I am an Australian passport holder. I will be flying into Beijing and then fly out to Japan, which I understand will require one. However, on my return flight from Japan back to Australia, there is a 3 hour transit in Shanghai, do I need a second one for the 3 hour transit ? Thanks.