Making sure that heartbeat statuses are in sync

Seems to work now but I'm contemplating if we should add a timer that runs every min and refreshes just to make double sure we can never get out of sync