diff --git a/app/images/avatar-missing.png b/app/images/avatar-missing.png
new file mode 100644
index 000000000..b3e6b5709
Binary files /dev/null and b/app/images/avatar-missing.png differ
diff --git a/app/images/avatar-missing.svg b/app/images/avatar-missing.svg
new file mode 100644
index 000000000..7eb156089
--- /dev/null
+++ b/app/images/avatar-missing.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="240"
+   inkscape:export-xdpi="240"
+   inkscape:export-filename="/home/alex/Projects/docker-tribe/avi.png"
+   sodipodi:docname="avatar.svg"
+   width="120"
+   height="120"
+   viewBox="0 0 31.75 31.750001"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:window-height="1019"
+     inkscape:window-width="1920"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.3194033"
+     inkscape:cx="79.987899"
+     inkscape:cy="64.129228"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-global="false"
+     inkscape:pagecheckerboard="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.80272198,1.2346106)">
+    <rect
+       style="fill:#10b3d1;fill-opacity:1;stroke:none;stroke-width:1.53052;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect853"
+       width="31.75"
+       height="31.75"
+       x="-0.80272198"
+       y="-1.2346106" />
+    <path
+       id="path857"
+       style="fill:#f4962a;fill-opacity:1;stroke:#000000;stroke-width:1.48265;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.051525,3.9344041 A 10.434797,10.434797 0 0 0 4.6372555,14.368944 a 10.434797,10.434797 0 0 0 0,0.02075 v 0.03137 a 1.7839264,2.3625556 0 0 0 -0.9503056,-0.363423 1.7839264,2.3625556 0 0 0 -1.7838141,2.362493 1.7839264,2.3625556 0 0 0 1.7838141,2.362491 1.7839264,2.3625556 0 0 0 0.9503056,-0.363423 v 23.74268 H 25.507302 v -23.74268 a 1.7839264,2.3625556 0 0 0 0.950305,0.363423 1.7839264,2.3625556 0 0 0 1.783814,-2.362491 1.7839264,2.3625556 0 0 0 -1.783814,-2.362493 1.7839264,2.3625556 0 0 0 -0.950305,0.362941 v -0.05164 A 10.434797,10.434797 0 0 0 15.072278,3.9344041 a 10.434797,10.434797 0 0 0 -0.02075,0 z" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.900495;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path881-6"
+       cx="11.218504"
+       cy="13.292331"
+       r="1.3086123" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.900495;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path881-7"
+       cx="18.926052"
+       cy="13.292331"
+       r="1.3086123" />
+    <ellipse
+       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.88959;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path917"
+       cx="15.072279"
+       cy="18.343904"
+       rx="7.1666903"
+       ry="4.0659413" />
+    <path
+       id="path957"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.88959;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 21.900069,17.108362 a 7.1666903,4.0659412 0 0 1 -6.82779,2.8304 7.1666903,4.0659412 0 0 1 -6.8277959,-2.830413" />
+    <path
+       id="path1003"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.88959;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:transform-center-y="-0.79831289"
+       d="m 13.062455,16.997512 c 0.457808,-1.227486 1.336486,-2.475611 2.009822,-2.475611 0.673338,0 1.552013,1.248125 2.009824,2.475611" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 24.842957,6.3249745 c -1.070225,-0.4344716 -2.309802,0.1182843 -2.464817,1.0590207 0,0 -1.627232,-1.9230616 1.219705,-3.5847621"
+       id="path1030"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/app/soapbox/actions/importer/normalizer.js b/app/soapbox/actions/importer/normalizer.js
index 0f3f2da6e..7c5aa8bd3 100644
--- a/app/soapbox/actions/importer/normalizer.js
+++ b/app/soapbox/actions/importer/normalizer.js
@@ -19,6 +19,8 @@ export function normalizeAccount(account) {
   if (!account.emojis) account.emojis = [];
   if (!account.display_name) account.display_name = '';
   if (!account.note) account.note = '';
+  if (!account.avatar) account.avatar = account.avatar_static || require('images/avatar-missing.png');
+  if (!account.avatar_static) account.avatar_static = account.avatar;
 
   const emojiMap = makeEmojiMap(account);
   const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
diff --git a/app/soapbox/components/avatar.js b/app/soapbox/components/avatar.js
index d0df7959b..1bbca72cc 100644
--- a/app/soapbox/components/avatar.js
+++ b/app/soapbox/components/avatar.js
@@ -28,22 +28,14 @@ export default class Avatar extends React.PureComponent {
       height: `${size}px`,
     };
 
-    // Only render the image if src is provided
-    if (account.get('avatar')) {
-      return (
-        <StillImage
-          className={classNames('account__avatar', { 'account__avatar-inline': inline })}
-          style={style}
-          src={account.get('avatar')}
-          alt=''
-        />
-      );
-    } else {
-      // Fall back on rendering an empty div
-      return (
-        <div className={classNames('account__avatar', { 'account__avatar-inline': inline })} style={style} />
-      );
-    }
+    return (
+      <StillImage
+        className={classNames('account__avatar', { 'account__avatar-inline': inline })}
+        style={style}
+        src={account.get('avatar')}
+        alt=''
+      />
+    );
   }
 
 }