[Bug 1961762] [NEW] The fix for bug #1951769 can result in 500 Internal Server Error