adjust first message check, don't require heartbeat