diff --git a/js/app/src/router.tsx b/js/app/src/router.tsx
index 69c150318..d115b43ec 100644
--- a/js/app/src/router.tsx
+++ b/js/app/src/router.tsx
@@ -193,9 +193,7 @@ export const AvatarButton = () => {
   if (userProfile) {
     source = { uri: userProfile.avatar };
     return (
-      <AQLink
-        to={{ screen: "SettingsTab", params: { screen: "AccountCategory" } }}
-      >
+      <AQLink to={{ screen: "AccountCategory" }}>
         <ImageBackground
           key={source?.uri ?? "default"}
           source={source}
diff --git a/js/components/src/components/chat/chat-box.tsx b/js/components/src/components/chat/chat-box.tsx
index a03ab11f9..225a897a9 100644
--- a/js/components/src/components/chat/chat-box.tsx
+++ b/js/components/src/components/chat/chat-box.tsx
@@ -359,13 +359,17 @@ export function ChatBox({
           console.error("Slash command error:", result.error);
         }
       } else {
-        createChatMessage({
+        await createChatMessage({
           text: messageText,
           reply: replyTo || undefined,
         });
       }
     } catch (err) {
       console.error("Error submitting message:", err);
+      toast.show("Failed to send message", "Please try again.", {
+        variant: "error",
+        duration: 3,
+      });
     } finally {
       setSubmitting(false);
     }
diff --git a/js/components/src/livestream-store/chat.tsx b/js/components/src/livestream-store/chat.tsx
index da6a63ccd..857037c14 100644
--- a/js/components/src/livestream-store/chat.tsx
+++ b/js/components/src/livestream-store/chat.tsx
@@ -151,11 +151,35 @@ export const useCreateChatMessage = () => {
     state = reduceChat(state, [localChat], [], []);
     store.setState(state);
 
-    await pdsAgent.com.atproto.repo.createRecord({
-      repo: userDID,
-      collection: "place.stream.chat.message",
-      record,
-    });
+    try {
+      await pdsAgent.com.atproto.repo.createRecord({
+        repo: userDID,
+        collection: "place.stream.chat.message",
+        record,
+      });
+    } catch (err) {
+      // Remove the optimistic message if the server call fails
+      const currentState = store.getState();
+      const updatedIndex = { ...currentState.chatIndex };
+      for (const [key, existingMsg] of Object.entries(updatedIndex)) {
+        if (existingMsg.uri === localChat.uri) {
+          delete updatedIndex[key];
+          break;
+        }
+      }
+      store.setState({
+        ...currentState,
+        chatIndex: updatedIndex,
+        chat: Object.keys(updatedIndex)
+          .sort((a, b) => {
+            const aTime = parseInt(a.split("-")[0], 10);
+            const bTime = parseInt(b.split("-")[0], 10);
+            return bTime - aTime;
+          })
+          .map((key) => updatedIndex[key]),
+      });
+      throw err;
+    }
   };
 };