Hopefully prevent flicker on refresh from server data