Fix feed killing based on heartbeat