Dying when you load into the Overworld after using the portal back from The End

After leaving The End via the fountain portal I load into the Overworld taking fall damage or dying with the message 'fell from a great height'. 

I have tried different bed locations and have downloaded the world and tried again with the same results.