Fix issue with stale state on upload form