diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 865346746..5e6be0394 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -2129,12 +2129,12 @@ class ChatController extends State<ChatPageWithRoom>
     }
   }
 
-  Future<void> _sendMessageAnalytics(
+  void _sendMessageAnalytics(
     String? eventId, {
     PangeaRepresentation? originalSent,
     PangeaMessageTokens? tokensSent,
     ChoreoRecordModel? choreo,
-  }) async {
+  }) {
     // There's a listen in my_analytics_controller that decides when to auto-update
     // analytics based on when / how many messages the logged in user send. This
     // stream sends the data for newly sent messages.
@@ -2157,8 +2157,8 @@ class ChatController extends State<ChatPageWithRoom>
         ),
       ];
 
-      await addAnalytics(constructs, eventId);
-      await _showAnalyticsFeedback(constructs, eventId);
+      _showAnalyticsFeedback(constructs, eventId);
+      addAnalytics(constructs, eventId);
     }
   }
 
@@ -2203,11 +2203,11 @@ class ChatController extends State<ChatPageWithRoom>
       final constructs = stt.constructs(roomId, eventId);
       if (constructs.isEmpty) return;
 
-      await Matrix.of(context).analyticsDataService.updateService.addAnalytics(
+      _showAnalyticsFeedback(constructs, eventId);
+      Matrix.of(context).analyticsDataService.updateService.addAnalytics(
             eventId,
             constructs,
           );
-      await _showAnalyticsFeedback(constructs, eventId);
     } catch (e, s) {
       ErrorHandler.logError(
         e: e,
diff --git a/lib/pangea/analytics_misc/growth_animation.dart b/lib/pangea/analytics_misc/growth_animation.dart
index 7f36a30da..7cd42c4fa 100644
--- a/lib/pangea/analytics_misc/growth_animation.dart
+++ b/lib/pangea/analytics_misc/growth_animation.dart
@@ -1,8 +1,9 @@
 import 'dart:math';
 
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/constructs/construct_level_enum.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
 
 /// Tracks active growth animations for offset calculation
 class GrowthAnimationTracker {
diff --git a/lib/pangea/common/utils/overlay.dart b/lib/pangea/common/utils/overlay.dart
index b9ffabf2d..de3187b29 100644
--- a/lib/pangea/common/utils/overlay.dart
+++ b/lib/pangea/common/utils/overlay.dart
@@ -1,5 +1,8 @@
 import 'dart:developer';
 
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/analytics_misc/gain_points_animation.dart';
 import 'package:fluffychat/pangea/analytics_misc/growth_animation.dart';
 import 'package:fluffychat/pangea/analytics_misc/level_up/star_rain_widget.dart';
@@ -13,9 +16,6 @@ import 'package:fluffychat/pangea/common/widgets/overlay_container.dart';
 import 'package:fluffychat/pangea/common/widgets/transparent_backdrop.dart';
 import 'package:fluffychat/pangea/constructs/construct_level_enum.dart';
 import 'package:fluffychat/pangea/learning_settings/language_mismatch_popup.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
 import '../../../config/themes.dart';
 import '../../../widgets/matrix.dart';
 import 'error_handler.dart';