Further work to fix network health on page refresh [Ignore Deploy]