Fix blocking when upgrading db to v19