diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
index 05388751..d3e86fa6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
@@ -22,8 +22,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.Locale;
 
 /**
@@ -124,13 +122,8 @@ public class CustomArtistImageUtil {
     }
 
     private static String getFileName(Artist artist) {
-        try {
-            return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), URLEncoder.encode(artist.getName(), "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-            // UTF-8 should be always valid
-            return null;
-        }
+        // replace everything that is not a letter or a number with _
+        return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artist.getName().replaceAll("[^a-zA-Z0-9]", "_"));
     }
 
     public static File getFile(Artist artist) {