diff --git a/app/src/main/frontend/components/general/Avatar.tsx b/app/src/main/frontend/components/general/Avatar.tsx
index 78df1de..7f1d217 100644
--- a/app/src/main/frontend/components/general/Avatar.tsx
+++ b/app/src/main/frontend/components/general/Avatar.tsx
@@ -15,13 +15,22 @@ const Avatar = ({...props}) => {
     }
 
     // TODO: Check if avatar can be loaded from SSO
-    return (
-        <NextUiAvatar
-            showFallback
-            src={`/images/avatar?username=${username}`}
-            {...props}
-        />
-    );
+    if (auth.state.user?.hasAvatar) {
+        return (
+            <NextUiAvatar
+                showFallback
+                src={`/images/avatar?username=${username}`}
+                {...props}
+            />
+        );
+    } else {
+        return (
+            <NextUiAvatar
+                showFallback
+                {...props}
+            />
+        );
+    }
 }
 
 export default Avatar;
\ No newline at end of file