diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
index c9c05aca1..2932aae47 100644
--- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
+++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart
@@ -654,11 +654,17 @@ class PangeaMessageEvent {
     }
   }
 
-  List<PracticeActivityEvent> practiceActivities(String langCode) {
+  List<PracticeActivityEvent> practiceActivities(String langCode,
+      {bool debug = false}) {
     try {
-      return _practiceActivityEvents
-          .where((ev) => ev.practiceActivity.langCode == langCode)
-          .toList();
+      debugger(when: debug);
+      final List<PracticeActivityEvent> activities = [];
+      for (final event in _practiceActivityEvents) {
+        if (event.practiceActivity.langCode == langCode) {
+          activities.add(event);
+        }
+      }
+      return activities;
     } catch (e, s) {
       debugger(when: kDebugMode);
       ErrorHandler.logError(e: e, s: s, data: event.toJson());
diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
index 9bb5aacbe..39729aa7c 100644
--- a/lib/pangea/widgets/chat/message_toolbar.dart
+++ b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -16,7 +16,7 @@ import 'package:fluffychat/pangea/widgets/chat/message_translation_card.dart';
 import 'package:fluffychat/pangea/widgets/chat/message_unsubscribed_card.dart';
 import 'package:fluffychat/pangea/widgets/chat/overlay_message.dart';
 import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart';
-import 'package:fluffychat/pangea/widgets/practice_activity_card/message_practice_activity_card.dart';
+import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_card.dart';
 import 'package:fluffychat/pangea/widgets/user_settings/p_language_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/foundation.dart';
diff --git a/lib/pangea/widgets/practice_activity_card/generate_practice_activity.dart b/lib/pangea/widgets/practice_activity/generate_practice_activity.dart
similarity index 100%
rename from lib/pangea/widgets/practice_activity_card/generate_practice_activity.dart
rename to lib/pangea/widgets/practice_activity/generate_practice_activity.dart
diff --git a/lib/pangea/widgets/practice_activity_card/multiple_choice_activity.dart b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
similarity index 95%
rename from lib/pangea/widgets/practice_activity_card/multiple_choice_activity.dart
rename to lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
index f74dc03ce..c2861ffe0 100644
--- a/lib/pangea/widgets/practice_activity_card/multiple_choice_activity.dart
+++ b/lib/pangea/widgets/practice_activity/multiple_choice_activity.dart
@@ -2,7 +2,7 @@ import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/choice_array.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart';
-import 'package:fluffychat/pangea/widgets/practice_activity_card/message_practice_activity_content.dart';
+import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_content.dart';
 import 'package:flutter/material.dart';
 
 class MultipleChoiceActivity extends StatelessWidget {
diff --git a/lib/pangea/widgets/practice_activity_card/message_practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
similarity index 83%
rename from lib/pangea/widgets/practice_activity_card/message_practice_activity_card.dart
rename to lib/pangea/widgets/practice_activity/practice_activity_card.dart
index d69627fcb..f4312b8fd 100644
--- a/lib/pangea/widgets/practice_activity_card/message_practice_activity_card.dart
+++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
@@ -1,8 +1,11 @@
+import 'dart:developer';
+
 import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart';
-import 'package:fluffychat/pangea/widgets/practice_activity_card/generate_practice_activity.dart';
-import 'package:fluffychat/pangea/widgets/practice_activity_card/message_practice_activity_content.dart';
+import 'package:fluffychat/pangea/widgets/practice_activity/generate_practice_activity.dart';
+import 'package:fluffychat/pangea/widgets/practice_activity/practice_activity_content.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
@@ -37,11 +40,16 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text(L10n.of(context)!.noLanguagesSet)),
       );
+      debugger(when: kDebugMode);
       return;
     }
 
     practiceEvent =
         widget.pangeaMessageEvent.practiceActivities(langCode).firstOrNull;
+
+    if (practiceEvent == null) {
+      debugger(when: kDebugMode);
+    }
     setState(() {});
   }
 
diff --git a/lib/pangea/widgets/practice_activity_card/message_practice_activity_content.dart b/lib/pangea/widgets/practice_activity/practice_activity_content.dart
similarity index 97%
rename from lib/pangea/widgets/practice_activity_card/message_practice_activity_content.dart
rename to lib/pangea/widgets/practice_activity/practice_activity_content.dart
index 6b7ebf7d9..d5f387cfd 100644
--- a/lib/pangea/widgets/practice_activity_card/message_practice_activity_content.dart
+++ b/lib/pangea/widgets/practice_activity/practice_activity_content.dart
@@ -6,7 +6,7 @@ import 'package:fluffychat/pangea/matrix_event_wrappers/practice_acitivity_recor
 import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_record_model.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
-import 'package:fluffychat/pangea/widgets/practice_activity_card/multiple_choice_activity.dart';
+import 'package:fluffychat/pangea/widgets/practice_activity/multiple_choice_activity.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';