diff --git a/src/Avatar.tsx b/src/Avatar.tsx
index 8d89865e..d7768d6f 100644
--- a/src/Avatar.tsx
+++ b/src/Avatar.tsx
@@ -110,16 +110,24 @@ export const Avatar: FC<Props> = ({
     }
 
     let objectUrl: string | undefined;
+    let stale = false;
     blob
       .then((blob) => {
+        if (stale) {
+          return;
+        }
         objectUrl = URL.createObjectURL(blob);
         setAvatarUrl(objectUrl);
       })
       .catch((ex) => {
+        if (stale) {
+          return;
+        }
         setAvatarUrl(undefined);
       });
 
     return (): void => {
+      stale = true;
       if (objectUrl) {
         URL.revokeObjectURL(objectUrl);
       }