Fix issue with double server page rendering