Fixing code review from security team issue...

Fixing code review from security team issue https://www.drupal.org/project/projectapplications/issues/3436287