LPS-41410

This is an update for [LPS-41410](https://issues.liferay.com/browse/LPS-41410).<br><br>Hey Minhchau, this seems to do it, but are there any pitfalls I should be aware of with this fix?  If not, I'll make a new ticket and submit this to Jorge. Thanks!