diff --git a/src/components/Circle.tsx b/src/components/Circle.tsx
new file mode 100644
index 00000000..401f4924
--- /dev/null
+++ b/src/components/Circle.tsx
@@ -0,0 +1,26 @@
+import styled from 'styled-components';
+
+import { stringToColor, isColorDark } from '../utils/stringToColor';
+
+export const Circle = styled.div<{ size: number; str: string }>`
+    border-radius: 100%;
+
+    ${({ size, str }) => {
+        const mainColor = stringToColor(str);
+        return {
+            width: `${size}px`,
+            height: `${size}px`,
+            background: `linear-gradient(90deg,${mainColor},${stringToColor(str.toUpperCase())})`,
+            color: `${isColorDark(mainColor) ? 'white' : 'black'}`,
+            fontSize: `calc(${size / 2}px - 2px)`,
+        };
+    }};
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    letter-spacing: -1.5px;
+    font-weight: 600;
+    user-select: none;
+`;
diff --git a/src/components/Gravatar.tsx b/src/components/Gravatar.tsx
index 814f0d06..a6aa37cb 100644
--- a/src/components/Gravatar.tsx
+++ b/src/components/Gravatar.tsx
@@ -1,9 +1,12 @@
-import React, { FC, useCallback, useEffect, useRef } from 'react';
+import React, { FC, useState } from 'react';
 import md5Hash from 'md5';
 import styled from 'styled-components';
 
 import { isRetina } from '../utils/isRetina';
-import { useMounted } from '../hooks';
+import { preloadImage } from '../utils/preloadImage';
+import { getInitials } from '../utils/getInitials';
+
+import { Circle } from './Circle';
 
 interface GravatarProps extends React.HTMLAttributes<HTMLImageElement> {
     email?: string | null;
@@ -13,8 +16,8 @@ interface GravatarProps extends React.HTMLAttributes<HTMLImageElement> {
     def?: string;
     className?: string;
     domain?: string;
+    name?: string | null;
 
-    onLoadError?: () => void;
     onClick?: () => void;
 }
 
@@ -30,13 +33,11 @@ export const Gravatar: FC<GravatarProps> = ({
     domain = process.env.NEXT_PUBLIC_GRAVATAR_HOST || 'www.gravatar.com',
     email,
     md5,
-    onLoadError,
+    name,
     ...props
 }) => {
-    const mounted = useMounted();
-    const imgRef = useRef<HTMLImageElement>(null);
-
-    const base = `//${domain}/avatar/`;
+    const [isError, setIsError] = useState(false);
+    const [isLoad, setIsLoad] = useState(false);
 
     const query = new URLSearchParams({
         s: String(size),
@@ -52,14 +53,6 @@ export const Gravatar: FC<GravatarProps> = ({
 
     const formattedEmail = email?.trim().toLowerCase() || '';
 
-    const onError: React.ReactEventHandler<HTMLImageElement> = useCallback(
-        ({ currentTarget }) => {
-            currentTarget.onerror = null;
-            onLoadError?.();
-        },
-        [onLoadError],
-    );
-
     let hash;
     if (md5) {
         hash = md5;
@@ -71,14 +64,20 @@ export const Gravatar: FC<GravatarProps> = ({
         return <script />;
     }
 
+    const base = `//${domain}/avatar/`;
     const src = `${base}${hash}?${query}`;
     const retinaSrc = `${base}${hash}?${retinaQuery}`;
+    const img = isRetina() ? retinaSrc : src;
 
-    useEffect(() => {
-        if (imgRef.current && mounted) {
-            imgRef.current.src = isRetina() ? retinaSrc : src;
-        }
-    }, [imgRef, mounted, src, retinaSrc]);
+    preloadImage(img)
+        .then(() => setIsLoad?.(true))
+        .catch(() => setIsError?.(true));
 
-    return <StyledImage ref={imgRef} height={size} width={size} onError={onError} {...props} />;
+    return !isLoad || isError ? (
+        <Circle size={size} str={`${email}`} {...props}>
+            {getInitials(name)}
+        </Circle>
+    ) : (
+        <StyledImage src={img} height={size} width={size} {...props} />
+    );
 };
diff --git a/src/components/UserPic.tsx b/src/components/UserPic.tsx
index 6bebd94f..120a43ce 100644
--- a/src/components/UserPic.tsx
+++ b/src/components/UserPic.tsx
@@ -1,9 +1,11 @@
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
 
-import { stringToColor, isColorDark } from '../utils/stringToColor';
+import { preloadImage } from '../utils/preloadImage';
+import { getInitials } from '../utils/getInitials';
 
 import { Gravatar } from './Gravatar';
+import { Circle } from './Circle';
 
 interface UserPicProps extends React.HTMLAttributes<HTMLImageElement> {
     src?: string | null;
@@ -20,62 +22,23 @@ const StyledImage = styled.img`
     border-radius: 100%;
 `;
 
-const Circle = styled.div<{ size: number; str: string }>`
-    border-radius: 100%;
-
-    ${({ size, str }) => {
-        const mainColor = stringToColor(str);
-        return {
-            width: `${size}px`,
-            height: `${size}px`,
-            background: `linear-gradient(90deg,${mainColor},${stringToColor(str.toUpperCase())})`,
-            color: `${isColorDark(mainColor) ? 'white' : 'black'}`,
-            fontSize: `calc(${size / 2}px - 2px)`,
-        };
-    }};
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    letter-spacing: -1.5px;
-    font-weight: 600;
-    user-select: none;
-`;
-
-const getInitials = (fullName?: string | null) => {
-    if (!fullName) return '';
-    const arr = fullName.split(' ');
-    return `${arr[0]?.[0] || ''} ${arr[1]?.[0] || ''}`;
-};
-
 export const UserPic: React.FC<UserPicProps> = ({ src, name, email, size = 32, ...props }) => {
     const [isError, setIsError] = useState(false);
-    const sizePx = `${size}px`;
-
-    const onLoadError = useCallback(() => {
-        setIsError(true);
-    }, []);
+    const [isLoad, setIsLoad] = useState(false);
 
-    const onError: React.ReactEventHandler<HTMLImageElement> = useCallback(
-        ({ currentTarget }) => {
-            currentTarget.onerror = null;
-            onLoadError();
-        },
-        [onLoadError],
-    );
+    if (src) {
+        preloadImage(src)
+            .then(() => setIsLoad(true))
+            .catch(() => setIsError(true));
 
-    if (isError) {
-        return (
+        return !isLoad || isError ? (
             <Circle size={size} str={`${email}`} {...props}>
                 {getInitials(name)}
             </Circle>
+        ) : (
+            <StyledImage src={src} height={size} width={size} {...props} />
         );
     }
 
-    if (src) {
-        return <StyledImage src={src} height={sizePx} width={sizePx} onError={onError} {...props} />;
-    }
-
-    return <Gravatar onLoadError={onLoadError} email={email} size={size} {...props} />;
+    return <Gravatar name={name} email={email} size={size} {...props} />;
 };
diff --git a/src/utils/getInitials.ts b/src/utils/getInitials.ts
new file mode 100644
index 00000000..3344e222
--- /dev/null
+++ b/src/utils/getInitials.ts
@@ -0,0 +1,5 @@
+export const getInitials = (fullName?: string | null) => {
+    if (!fullName) return '';
+    const arr = fullName.split(' ');
+    return `${arr[0]?.[0] || ''} ${arr[1]?.[0] || ''}`;
+};
diff --git a/src/utils/preloadImage.ts b/src/utils/preloadImage.ts
new file mode 100644
index 00000000..6a7d73de
--- /dev/null
+++ b/src/utils/preloadImage.ts
@@ -0,0 +1,15 @@
+export const preloadImage = (src: string) => {
+    return new Promise((resolve, reject) => {
+        const img = new Image();
+
+        img.onload = () => {
+            resolve(img);
+        };
+
+        img.onerror = (error) => {
+            reject(error);
+        };
+
+        img.src = src;
+    });
+};