Dutch citizen, but arriving from Vietnam in Shanghai

Hi,

I am Dutch, will be in HCM city for 4 days, and then be 3 days (direct flight) in Shanghai, before returning to the Netherlands (again direct flight). So arrival and departure will be from/to different airports, but my departure will not be to a 'third' country, but to my home country. Although, I arrive from a third country. So, the visa free possiblity will apply for my case?

Toine