diff --git a/lib/pangea/controllers/speech_to_text_controller.dart b/lib/pangea/controllers/speech_to_text_controller.dart
index 6b302b101..8b61da79e 100644
--- a/lib/pangea/controllers/speech_to_text_controller.dart
+++ b/lib/pangea/controllers/speech_to_text_controller.dart
@@ -74,18 +74,21 @@ class SpeechToTextController {
     }
     debugPrint('Saving transcript as matrix event');
 
-    requestModel.audioEvent?.room.sendPangeaEvent(
-      content: PangeaRepresentation(
-        langCode: response.langCode,
-        text: response.transcript.text,
-        originalSent: false,
-        originalWritten: false,
-        speechToText: response,
-      ).toJson(),
-      parentEventId: requestModel.audioEvent!.eventId,
-      type: PangeaEventTypes.representation,
-    );
-    debugPrint('Transcript saved as matrix event');
+    requestModel.audioEvent?.room
+        .sendPangeaEvent(
+          content: PangeaRepresentation(
+            langCode: response.langCode,
+            text: response.transcript.text,
+            originalSent: false,
+            originalWritten: false,
+            speechToText: response,
+          ).toJson(),
+          parentEventId: requestModel.audioEvent!.eventId,
+          type: PangeaEventTypes.representation,
+        )
+        .then(
+          (_) => debugPrint('Transcript saved as matrix event'),
+        );
 
     return Future.value(null);
   }
diff --git a/lib/pangea/models/pangea_token_model.dart b/lib/pangea/models/pangea_token_model.dart
index 19eaba750..a671256ab 100644
--- a/lib/pangea/models/pangea_token_model.dart
+++ b/lib/pangea/models/pangea_token_model.dart
@@ -60,7 +60,7 @@ class PangeaToken {
   static const String _lemmaKey = ModelKey.lemma;
 
   Map<String, dynamic> toJson() => {
-        _textKey: text,
+        _textKey: text.toJson(),
         _hasInfoKey: hasInfo,
         _lemmaKey: lemmas.map((e) => e.toJson()).toList(),
       };
diff --git a/lib/pangea/models/speech_to_text_models.dart b/lib/pangea/models/speech_to_text_models.dart
index 005d2371f..7d21fd718 100644
--- a/lib/pangea/models/speech_to_text_models.dart
+++ b/lib/pangea/models/speech_to_text_models.dart
@@ -117,7 +117,7 @@ class STTToken {
   }
 
   Map<String, dynamic> toJson() => {
-        "token": token,
+        "token": token.toJson(),
         "start_time": startTime?.inMilliseconds,
         "end_time": endTime?.inMilliseconds,
         "confidence": confidence,