diff --git a/web/lib/firebase/challenges.ts b/web/lib/firebase/challenges.ts
index d62d5aac..89da7f80 100644
--- a/web/lib/firebase/challenges.ts
+++ b/web/lib/firebase/challenges.ts
@@ -134,11 +134,11 @@ export function listenForUserChallenges(
   return listenForValues<Challenge>(listUserChallenges(fromId), setLinks)
 }
 
-export const useUserChallenges = (fromId: string) => {
+export const useUserChallenges = (fromId?: string) => {
   const [links, setLinks] = useState<Challenge[]>([])
 
   useEffect(() => {
-    return listenForUserChallenges(fromId, setLinks)
+    if (fromId) return listenForUserChallenges(fromId, setLinks)
   }, [fromId])
 
   return links
diff --git a/web/pages/challenges/index.tsx b/web/pages/challenges/index.tsx
index 40e00084..7c68f0bd 100644
--- a/web/pages/challenges/index.tsx
+++ b/web/pages/challenges/index.tsx
@@ -36,8 +36,12 @@ const amountClass = columnClass + ' max-w-[75px] font-bold'
 
 export default function ChallengesListPage() {
   const user = useUser()
-  const userChallenges = useUserChallenges(user?.id ?? '')
   const challenges = useAcceptedChallenges()
+  const userChallenges = useUserChallenges(user?.id)
+    .concat(
+      user ? challenges.filter((c) => c.acceptances[0].userId === user.id) : []
+    )
+    .sort((a, b) => b.createdTime - a.createdTime)
 
   const userTab = user
     ? [