diff --git a/app/src/main/java/com/keylesspalace/tusky/db/InstanceEntity.kt b/app/src/main/java/com/keylesspalace/tusky/db/InstanceEntity.kt
index aba14f58..95ce1fc3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/InstanceEntity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/InstanceEntity.kt
@@ -34,12 +34,12 @@ data class InstanceEntity(
 class Converters {
 
     @TypeConverter
-    fun jsonToList(emojiListJson: String): List<Emoji> {
+    fun jsonToList(emojiListJson: String?): List<Emoji>? {
         return Gson().fromJson(emojiListJson, object : TypeToken<List<Emoji>>() {}.type)
     }
 
     @TypeConverter
-    fun listToJson(emojiList: List<Emoji>): String {
+    fun listToJson(emojiList: List<Emoji>?): String {
         return Gson().toJson(emojiList)
     }
 }
\ No newline at end of file