diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
index 6c306eb..3e4694f 100644
--- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
+++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
@@ -110,17 +110,17 @@ fun ChatScreen(id: Long) {
         // Start loading spinner
         loading = true
 
-        // Get msg relays for each member
-        viewModel.chatRoomConnect(id)
-
         // Get messages
         val initialMessages = viewModel.getChatRoomMessages(id)
         messages.clear()
         messages.addAll(initialMessages)
-        
+
         // Stop loading spinner
         loading = false
 
+        // Get msg relays for each member
+        viewModel.chatRoomConnect(id)
+
         // Handle new messages
         viewModel.newEvents.collect { event ->
             if (event.roomId() == id) {
diff --git a/shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt b/shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt
index 4f25795..193e135 100644
--- a/shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt
+++ b/shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt
@@ -386,7 +386,7 @@ class Nostr {
             val tags = listOf(
                 Tag.identifier(giftId.toHex()),
                 Tag.event(rumor.id()!!),
-                Tag.custom("a", listOf(roomId.toString())),
+                Tag.custom("r", listOf(roomId.toString())),
                 Tag.custom("k", listOf("14"))
             )
 
@@ -396,7 +396,7 @@ class Nostr {
             // Construct event
             val event = EventBuilder(kind, rumor.asJson())
                 .tags(tags)
-                .finalizeAsync(signer)
+                .finalizeAsync(Keys.generate())
 
             client?.database()?.saveEvent(event)
         } catch (e: Exception) {