fix #39233 - 500 in merge request

Closes #39233

See merge request gitlab-org/gitlab-ce!15774