CON-2128 | Hotfix for chrome