CON-2342 | Fix for FF