diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
index 1fd97827..a3e54c7c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
@@ -90,6 +90,9 @@ public class AvatarController implements LastModified {
         if (userSettings.getAvatarScheme() == AvatarScheme.CUSTOM || forceCustom) {
             return settingsService.getCustomAvatar(username);
         }
+        if(userSettings.getAvatarScheme() == AvatarScheme.NONE) {
+            return null;
+        }
         return settingsService.getSystemAvatar(userSettings.getSystemAvatarId());
     }