diff --git a/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
index fd729a07..fd7bf762 100644
--- a/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
+++ b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt
@@ -14,20 +14,28 @@ class Converters {
     private val messageAttachmentType = object : TypeToken<MessageAttachment?>() {}.type
 
     @TypeConverter
-    fun jsonToAttachmentList(value: String) = gson.fromJson<ArrayList<Attachment>>(value, attachmentType)
+    fun jsonToAttachmentList(value: String?): ArrayList<Attachment>? {
+        return gson.fromJson<ArrayList<Attachment>>(value, attachmentType)
+    }
 
     @TypeConverter
     fun attachmentListToJson(list: ArrayList<Attachment>) = gson.toJson(list)
 
     @TypeConverter
-    fun jsonToSimpleContactList(value: String) = gson.fromJson<ArrayList<SimpleContact>>(value, simpleContactType)
+    fun jsonToSimpleContactList(value: String?): ArrayList<SimpleContact>? {
+        return gson.fromJson<ArrayList<SimpleContact>>(value, simpleContactType)
+    }
 
     @TypeConverter
     fun simpleContactListToJson(list: ArrayList<SimpleContact>) = gson.toJson(list)
 
     @TypeConverter
-    fun jsonToMessageAttachment(value: String) = gson.fromJson<MessageAttachment>(value, messageAttachmentType)
+    fun jsonToMessageAttachment(value: String): MessageAttachment? {
+        return gson.fromJson<MessageAttachment>(value, messageAttachmentType)
+    }
 
     @TypeConverter
-    fun messageAttachmentToJson(messageAttachment: MessageAttachment?) = gson.toJson(messageAttachment)
+    fun messageAttachmentToJson(messageAttachment: MessageAttachment?): String? {
+        return gson.toJson(messageAttachment)
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ae36c33..a6d389de 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 kotlin = "2.1.21"
 kotlinxSerializationJson = "1.8.1"
 #KSP
-ksp = "1.9.25-1.0.20"
+ksp = "2.1.21-2.0.1"
 #Detekt
 detekt = "1.23.8"
 #AndroidX