diff --git a/lib/pangea/constructs/construct_identifier.dart b/lib/pangea/constructs/construct_identifier.dart
index 341ff404c..5934117f3 100644
--- a/lib/pangea/constructs/construct_identifier.dart
+++ b/lib/pangea/constructs/construct_identifier.dart
@@ -176,11 +176,14 @@ class ConstructIdentifier {
   }
 
   Future<void> setUserLemmaInfo(UserSetLemmaInfo newLemmaInfo) async {
-    final analyticsRoom =
-        MatrixState.pangeaController.matrixState.client.analyticsRoomLocal();
+    final client = MatrixState.pangeaController.matrixState.client;
+    final l2 = MatrixState.pangeaController.languageController.userL2;
+    if (l2 == null) return;
+
+    final analyticsRoom = await client.getMyAnalyticsRoom(l2);
     if (analyticsRoom == null) return;
+
     try {
-      final client = MatrixState.pangeaController.matrixState.client;
       final syncFuture = client.onRoomState.stream.firstWhere((event) {
         return event.roomId == analyticsRoom.id &&
             event.state.type == PangeaEventTypes.userSetLemmaInfo;
diff --git a/lib/pangea/lemmas/lemma_emoji_row.dart b/lib/pangea/lemmas/lemma_emoji_row.dart
index 23795ea1b..e4b5ab4fe 100644
--- a/lib/pangea/lemmas/lemma_emoji_row.dart
+++ b/lib/pangea/lemmas/lemma_emoji_row.dart
@@ -104,26 +104,19 @@ class LemmaEmojiRowState extends State<LemmaEmojiRow> {
     try {
       displayEmoji = emoji;
 
-      widget.cId
-          .setUserLemmaInfo(
+      await widget.cId.setUserLemmaInfo(
         UserSetLemmaInfo(
           emojis: [emoji],
         ),
-      )
-          .catchError((e, s) {
-        debugger(when: kDebugMode);
-        ErrorHandler.logError(data: widget.cId.toJson(), e: e, s: s);
-      }).then((_) {
-        if (mounted) {
-          widget.emojiSetCallback?.call();
-          setState(() {});
-        }
-      });
+      );
+
+      if (mounted) {
+        widget.emojiSetCallback?.call();
+        setState(() {});
+      }
 
       MatrixState.pAnyState.closeOverlay();
-
       widget.emojiSetCallback?.call();
-
       setState(() {});
     } catch (e, s) {
       debugger(when: kDebugMode);