[TECH SUPPORT] LPS-34084

Hi Julio,

I extended this fix based on Brian's comment on https://github.com/brianchandotcom/liferay-portal/pull/10112

Please review, further fix if necessary and forward.

Thx