Resolve "Post hydration issue when edit"