diff --git a/apps/expo/src/components/feed-row.tsx b/apps/expo/src/components/feed-row.tsx
index 841f7e24..6662e77c 100644
--- a/apps/expo/src/components/feed-row.tsx
+++ b/apps/expo/src/components/feed-row.tsx
@@ -78,14 +78,24 @@ export const FeedRow = ({
         className="flex-row items-center px-4 py-3"
         accessibilityElementsHidden
       >
-        <Image
-          source={{ uri: feed.avatar }}
-          alt={feed.displayName}
-          className={cx(
-            "shrink-0 items-center justify-center rounded bg-blue-500",
-            large ? "h-10 w-10" : "h-6 w-6",
-          )}
-        />
+        {feed.avatar ? (
+          <Image
+            source={{ uri: feed.avatar }}
+            recyclingKey={feed.avatar}
+            alt={feed.displayName}
+            className={cx(
+              "shrink-0 items-center justify-center rounded bg-blue-500",
+              large ? "h-10 w-10" : "h-6 w-6",
+            )}
+          />
+        ) : (
+          <View
+            className={cx(
+              "shrink-0 rounded bg-blue-500",
+              large ? "h-10 w-10" : "h-6 w-6",
+            )}
+          />
+        )}
         <View className="mx-3 flex-1 flex-row items-center">
           <View>
             <Text className="text-base" numberOfLines={1}>
diff --git a/apps/nextjs/src/app/global-error.jsx b/apps/nextjs/src/app/global-error.jsx
deleted file mode 100644
index 2e6130a1..00000000
--- a/apps/nextjs/src/app/global-error.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-"use client";
-
-import * as Sentry from "@sentry/nextjs";
-import Error from "next/error";
-import { useEffect } from "react";
-
-export default function GlobalError({ error }) {
-  useEffect(() => {
-    Sentry.captureException(error);
-  }, [error]);
-
-  return (
-    <html>
-      <body>
-        <Error />
-      </body>
-    </html>
-  );
-}
diff --git a/apps/nextjs/src/app/global-error.tsx b/apps/nextjs/src/app/global-error.tsx
new file mode 100644
index 00000000..82a48c86
--- /dev/null
+++ b/apps/nextjs/src/app/global-error.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import { useEffect } from "react";
+import * as Sentry from "@sentry/nextjs";
+
+export default function GlobalError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    Sentry.captureException(error);
+  }, [error]);
+
+  return (
+    <html lang="en">
+      <body>
+        <h2>Something went wrong!</h2>
+        <button onClick={() => reset()}>Try again</button>
+      </body>
+    </html>
+  );
+}