diff --git a/library/src/main/java/org/xmtp/android/library/Group.kt b/library/src/main/java/org/xmtp/android/library/Group.kt
index 3c9b5a9a5..1dce2bba1 100644
--- a/library/src/main/java/org/xmtp/android/library/Group.kt
+++ b/library/src/main/java/org/xmtp/android/library/Group.kt
@@ -121,7 +121,7 @@ class Group(val client: Client, private val libXMTPGroup: FfiGroup) {
     fun decrypt(message: Message): DecryptedMessage {
         return DecryptedMessage(
             id = message.id.toHex(),
-            topic = message.id.toHex(),
+            topic = message.convoId.toHex(),
             encodedContent = message.decode().encodedContent,
             senderAddress = message.senderAddress,
             sentAt = Date()
diff --git a/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt b/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt
index 0b470c4ae..6b072cc61 100644
--- a/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt
+++ b/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt
@@ -12,6 +12,9 @@ data class Message(val client: Client, private val libXMTPMessage: FfiMessage) {
     val id: ByteArray
         get() = libXMTPMessage.id
 
+    val convoId: ByteArray
+        get() = libXMTPMessage.convoId
+
     val senderAddress: String
         get() = libXMTPMessage.addrFrom