diff --git a/server/lib/imageproxy.ts b/server/lib/imageproxy.ts
index 2b60c309..13f5d238 100644
--- a/server/lib/imageproxy.ts
+++ b/server/lib/imageproxy.ts
@@ -55,16 +55,12 @@ class ImageProxy {
       }
     } catch (e) {
       if (e.code === 'ENOENT') {
-        logger.error('Directory not found', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      } else {
-        logger.error('Failed to read directory', {
-          label: 'Image Cache',
-          message: e.message,
-        });
+        return;
       }
+      logger.error('Failed to read directory', {
+        label: 'Image Cache',
+        message: e.message,
+      });
     }
 
     logger.info(`Cleared ${deletedImages} stale image(s) from cache '${key}'`, {
diff --git a/server/routes/avatarproxy.ts b/server/routes/avatarproxy.ts
index ef523843..d89e6d7e 100644
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -141,13 +141,16 @@ router.get('/:jellyfinUserId', async (req, res) => {
 
     const jellyfinAvatarUrl = getJellyfinAvatarUrl(req.params.jellyfinUserId);
 
-    let imageData = await avatarImageCache.getImage(
-      jellyfinAvatarUrl,
-      fallbackUrl
-    );
-
-    if (imageData.meta.extension === 'json') {
-      // this is a 404
+    let imageData;
+    if (user?.avatarVersion) {
+      imageData = await avatarImageCache.getImage(
+        jellyfinAvatarUrl,
+        fallbackUrl
+      );
+      if (imageData.meta.extension === 'json') {
+        imageData = await avatarImageCache.getImage(fallbackUrl);
+      }
+    } else {
       imageData = await avatarImageCache.getImage(fallbackUrl);
     }