diff --git a/js/twitch/module.js b/js/twitch/module.js
index bcfdc42..bfa0c43 100644
--- a/js/twitch/module.js
+++ b/js/twitch/module.js
@@ -601,11 +601,16 @@ async function getTwitchAvatar(user) {
         }
         else {
             console.debug(`Twitch avatar not found for ${user}! Getting it from DECAPI!`);
-            var decapi = await fetch('https://decapi.me/twitch/avatar/' + user);
-            var newavatar = await decapi.text()
 
-            if (!newavatar) { newavatar = 'https://static-cdn.jtvnw.net/user-default-pictures-uv/cdd517fe-def4-11e9-948e-784f43822e80-profile_image-300x300.png'; }
-            
+            var decapi = await fetch('https://decapi.me/twitch/avatar/' + user);
+            var newavatar = await decapi.text();
+            newavatar = newavatar.trim();
+
+            if (!newavatar || newavatar.startsWith("User not found:")) {
+                console.debug(`Avatar not found for ${user}. Using default image.`);
+                newavatar = 'https://static-cdn.jtvnw.net/user-default-pictures-uv/cdd517fe-def4-11e9-948e-784f43822e80-profile_image-300x300.png';
+            }
+
             avatars.set(user, newavatar);
             return newavatar;
         }