diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotOutboundDao.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotOutboundDao.kt
index 13d86b89..c2801df9 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotOutboundDao.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotOutboundDao.kt
@@ -263,7 +263,7 @@ abstract class MarmotOutboundDao(
         }
     }
 
-    private suspend fun deliveryWelcome(
+    suspend fun deliveryWelcome(
         nostrGroupId: HexKey,
         userPublicKey: HexKey,
         welcomeBytes: ByteArray,
diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/NostrDao.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/NostrDao.kt
index ae54e8b3..d38b1149 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/NostrDao.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/NostrDao.kt
@@ -398,6 +398,12 @@ abstract class NostrDao(
                                 groupEvent = groupEvent
                             )?.let { groupEventResult ->
                                 logger.d("groupEventResult: $groupEventResult")
+                                // Save the mls chatRoom state...
+                                database.chatRoomDao().upsert(
+                                    localChatRoom.chatRoom.copy(
+                                        mlsGroupState = mlsGroup.saveState().encodeTls().toHex()
+                                    )
+                                )
                                 ChatMessage.fromGroupEventResult(
                                     database = database,
                                     activeKeyPair = activeKeyPair,