Handle better when server side rendering is enabled. re #82