Fix issue on fetch data first render

Fix issue on fetch data first render #452