Core bug on latest magento we can arrange quick fix from below links.

Patch:

https://github.com/magento/magento2/commit/a9170022cce29993e586ffaa6f4c1cc357ee3b11.diff

Related commit:

https://github.com/magento/magento2/commit/a9170022cce29993e586ffaa6f4c1cc357ee3b11