diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index da2a01666..88535725d 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -110,11 +110,11 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
 
   const [isSubmitting, setIsSubmitting] = useState(false);
 
-  const avatarField = useImageField({ maxPixels: 400 * 400, preview: nonDefaultAvatar(group?.avatar) });
-  const headerField = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(group?.header) });
+  const avatar = useImageField({ maxPixels: 400 * 400, preview: nonDefaultAvatar(group?.avatar) });
+  const header = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(group?.header) });
 
-  const displayNameField = useTextField(group?.display_name);
-  const noteField = useTextField(group?.note);
+  const displayName = useTextField(group?.display_name);
+  const note = useTextField(group?.note);
 
   const maxName = Number(instance.configuration.getIn(['groups', 'max_characters_name']));
   const maxNote = Number(instance.configuration.getIn(['groups', 'max_characters_description']));
@@ -127,10 +127,10 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
     setIsSubmitting(true);
 
     await updateGroup({
-      display_name: displayNameField.value,
-      note: noteField.value,
-      avatar: avatarField.file,
-      header: headerField.file,
+      display_name: displayName.value,
+      note: note.value,
+      avatar: avatar.file,
+      header: header.file,
     });
 
     setIsSubmitting(false);
@@ -144,8 +144,8 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
     <Column label={intl.formatMessage(messages.heading)}>
       <Form onSubmit={handleSubmit}>
         <div className='relative mb-12 flex'>
-          <HeaderPicker accept={attachmentTypes} disabled={isSubmitting} {...headerField} />
-          <AvatarPicker accept={attachmentTypes} disabled={isSubmitting} {...avatarField} />
+          <HeaderPicker accept={attachmentTypes} disabled={isSubmitting} {...header} />
+          <AvatarPicker accept={attachmentTypes} disabled={isSubmitting} {...avatar} />
         </div>
         <FormGroup
           labelText={<FormattedMessage id='manage_group.fields.name_label' defaultMessage='Group name (required)' />}
@@ -153,8 +153,8 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
           <Input
             type='text'
             placeholder={intl.formatMessage(messages.groupNamePlaceholder)}
-            {...displayNameField}
             maxLength={maxName}
+            {...displayName}
           />
         </FormGroup>
         <FormGroup
@@ -163,8 +163,8 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { id: groupId } }) => {
           <Textarea
             autoComplete='off'
             placeholder={intl.formatMessage(messages.groupDescriptionPlaceholder)}
-            {...noteField}
             maxLength={maxNote}
+            {...note}
           />
         </FormGroup>
 
diff --git a/app/soapbox/hooks/forms/useImageField.ts b/app/soapbox/hooks/forms/useImageField.ts
index d719653f1..7afe31f87 100644
--- a/app/soapbox/hooks/forms/useImageField.ts
+++ b/app/soapbox/hooks/forms/useImageField.ts
@@ -11,21 +11,19 @@ interface UseImageFieldOpts {
   preview?: string
 }
 
-/** Handle image, and optionally resize it. */
+/** Returns props for `<input type="file">`, and optionally resizes the file. */
 function useImageField(opts: UseImageFieldOpts = {}) {
   const [file, setFile] = useState<File>();
   const src = usePreview(file) || opts.preview;
 
-  const onChange: React.ChangeEventHandler<HTMLInputElement> = ({ target: { files } }) => {
-    const file = files?.item(0) || undefined;
-    if (file) {
-      if (typeof opts.maxPixels === 'number') {
-        resizeImage(file, opts.maxPixels)
-          .then((f) => setFile(f))
-          .catch(console.error);
-      } else {
-        setFile(file);
-      }
+  const onChange: React.ChangeEventHandler<HTMLInputElement> = async ({ target: { files } }) => {
+    const file = files?.item(0);
+    if (!file) return;
+
+    if (typeof opts.maxPixels === 'number') {
+      setFile(await resizeImage(file, opts.maxPixels));
+    } else {
+      setFile(file);
     }
   };
 
diff --git a/app/soapbox/hooks/forms/useTextField.ts b/app/soapbox/hooks/forms/useTextField.ts
index 7354f58c7..a8043611d 100644
--- a/app/soapbox/hooks/forms/useTextField.ts
+++ b/app/soapbox/hooks/forms/useTextField.ts
@@ -1,5 +1,9 @@
 import { useEffect, useState } from 'react';
 
+/**
+ * Returns props for `<input type="text">`.
+ * If `initialValue` changes from undefined to a string, it will set the value.
+ */
 function useTextField(initialValue: string | undefined) {
   const [value, setValue] = useState(initialValue);
   const hasInitialValue = typeof initialValue === 'string';
@@ -15,7 +19,7 @@ function useTextField(initialValue: string | undefined) {
   }, [hasInitialValue]);
 
   return {
-    value,
+    value: value || '',
     onChange,
   };
 }