Added disabled local storage workaround