diff --git a/ui/Puzzles.tsx b/ui/Puzzles.tsx
index 9e3267e..a3d1781 100644
--- a/ui/Puzzles.tsx
+++ b/ui/Puzzles.tsx
@@ -357,22 +357,22 @@ function GroupForm({ chapter, token }: { chapter: Chapter; token: string }) {
   });
 
   async function onSubmit(data: GroupData) {
-    await fetch(`${process.env.NEXT_PUBLIC_API_URL}/${isJoining ? 'groupJoin' : 'groupCreate'}`, {
-      method: 'POST',
-      body: JSON.stringify(data),
-      headers: {
-        Authorization: `Bearer ${token}`
+    const res = await fetch(
+      `${process.env.NEXT_PUBLIC_API_URL}/${isJoining ? 'groupJoin' : 'groupCreate'}`,
+      {
+        method: 'POST',
+        body: JSON.stringify(data),
+        headers: {
+          Authorization: `Bearer ${token}`
+        }
       }
-    });
-    // TODO: handle errors
-    // if (res.ok) {
-    //   if (!isJoining) {
-    //     mutate('groups');
-    //   } else {
-    //     mutate('me');
-    //   }
-    //   router.refresh();
-    // }
+    );
+
+    if (res.ok) {
+      mutate('me');
+      // TODO REFACTOR
+      router.refresh();
+    }
   }
 
   return (