Fix 'optimistically updating form data' demo bug. Copied from #6422

Fix 'optimistically updating form data' demo bug. Copied from #6422 #2615