diff --git a/src/views/shared/avatar-image/AvatarImageView.tsx b/src/views/shared/avatar-image/AvatarImageView.tsx
index a2a5ab56..ea9a823d 100644
--- a/src/views/shared/avatar-image/AvatarImageView.tsx
+++ b/src/views/shared/avatar-image/AvatarImageView.tsx
@@ -1,21 +1,23 @@
 import { AvatarScaleType, AvatarSetType } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useRef, useState } from 'react';
 import { GetAvatarRenderManager } from '../../../api';
 import { AvatarImageViewProps } from './AvatarImageView.types';
 
 export const AvatarImageView: FC<AvatarImageViewProps> = props =>
 {
     const { figure = '', gender = 'M', headOnly = false, direction = 0, scale = 1 } = props;
-
     const [ avatarUrl, setAvatarUrl ] = useState<string>(null);
     const [ randomValue, setRandomValue ] = useState(-1);
+    const isDisposed = useRef(false);
 
     useEffect(() =>
     {
-        if(randomValue) {}
-
         const avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.LARGE, gender, {
-            resetFigure: figure => setRandomValue(Math.random()),
+            resetFigure: figure => {
+                if(isDisposed.current) return;
+
+                setRandomValue(Math.random());
+            },
             dispose: () => {},
             disposed: false
         }, null);
@@ -35,6 +37,16 @@ export const AvatarImageView: FC<AvatarImageViewProps> = props =>
         avatarImage.dispose();
     }, [ figure, gender, direction, headOnly, randomValue ]);
 
+    useEffect(() =>
+    {
+        isDisposed.current = false;
+
+        return () =>
+        {
+            isDisposed.current = true;
+        }
+    }, []);
+
     const url = `url('${ avatarUrl }')`;
         
     return <div className={ 'avatar-image scale-' + scale } style={ (avatarUrl && url.length) ? { backgroundImage: url } : {} }></div>;