2 files changed, 8 insertions, 14 deletions
diff --git a/vnext/src/components/Avatar.js b/vnext/src/components/Avatar.js
index dc2050ce..d4e83b7b 100644
--- a/vnext/src/components/Avatar.js
+++ b/vnext/src/components/Avatar.js
@@ -17,16 +17,10 @@ function Avatar(props) {
     useEffect(() => {
         setUser(props.user);
         isMounted = true;
-        if (!user.uid && user.uri) {
-            fetchUserUri(user.uri).then(response => {
-                if (isMounted) {
-                    setUser(response.data);
-                }
-            });
-            return () => {
-                isMounted = false;
-            };
-        }
+        
+        return () => {
+            isMounted = false;
+        };
     }, [props.user, user.uid, user.uri]);
     return (
         <div className="Avatar" style={props.style}>
diff --git a/vnext/src/components/UserInfo.js b/vnext/src/components/UserInfo.js
index 19b2f82b..835bbace 100644
--- a/vnext/src/components/UserInfo.js
+++ b/vnext/src/components/UserInfo.js
@@ -77,15 +77,15 @@ export function UserLink(props) {
                     setUser(response.data);
                 }
             });
-            return () => {
-                isMounted = false;
-            };
         }
+        return () => {
+            isMounted = false;
+        };
     }, [props.user, user.uid, user.uri]);
     return (
         user.uid ?
             <Link key={user.uid} to={`/${user.uname}/`} className="info-avatar"><img src={user.avatar}/>{user.uname}</Link>
-            : <a href={user.uri}><img src={user.avatar}/>{user.uname}</a>
+            : <a href={user.uri} className="info-avatar"><img src={user.avatar}/>{user.uname}</a>
     );
 }