diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ArtistRowBinder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ArtistRowBinder.kt
index d83385ab..df9d8cc8 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ArtistRowBinder.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ArtistRowBinder.kt
@@ -102,8 +102,9 @@ class ArtistRowBinder(
     }
 
     private fun getSectionFromName(name: String): String {
-        var section = name.first().uppercaseChar()
-        if (!section.isLetter()) section = '#'
+        if (name.isEmpty()) return SECTION_KEY_DEFAULT
+        val section = name.first().uppercaseChar()
+        if (!section.isLetter()) return SECTION_KEY_DEFAULT
         return section.toString()
     }
 
@@ -123,4 +124,8 @@ class ArtistRowBinder(
     override fun onCreateViewHolder(inflater: LayoutInflater, parent: ViewGroup): ViewHolder {
         return ViewHolder(inflater.inflate(layout, parent, false))
     }
+
+    companion object {
+        const val SECTION_KEY_DEFAULT = "#"
+    }
 }