Lps 44894

This issue is almost same issue with https://issues.liferay.com/browse/LPS-44639
I follow the same solution pattern with LPS-44639 to fix this issue