Add setting to disable heartbeat