diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 85577e8e0..23c27b682 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -708,7 +708,9 @@ class ChatController extends State<ChatPageWithRoom>
   }
 
   void _onRouteChanged() {
-    stopMediaStream.add(null);
+    if (!stopMediaStream.isClosed) {
+      stopMediaStream.add(null);
+    }
     MatrixState.pAnyState.closeAllOverlays();
   }
 
diff --git a/lib/pangea/practice_activities/practice_record_repo.dart b/lib/pangea/practice_activities/practice_record_repo.dart
index 28394a7c9..b6a84e342 100644
--- a/lib/pangea/practice_activities/practice_record_repo.dart
+++ b/lib/pangea/practice_activities/practice_record_repo.dart
@@ -26,7 +26,7 @@ class PracticeRecordRepo {
   }
 
   static void clean() {
-    final Iterable<String> keys = _storage.getKeys();
+    final keys = _storage.getKeys();
     if (keys.length > 300) {
       final entries = keys
           .map((key) {
diff --git a/lib/pangea/practice_activities/practice_selection_repo.dart b/lib/pangea/practice_activities/practice_selection_repo.dart
index 3e31eb0f6..fc97ed381 100644
--- a/lib/pangea/practice_activities/practice_selection_repo.dart
+++ b/lib/pangea/practice_activities/practice_selection_repo.dart
@@ -48,7 +48,7 @@ class PracticeSelectionRepo {
   }
 
   static void clean() {
-    final Iterable<String> keys = _storage.getKeys();
+    final keys = _storage.getKeys();
     if (keys.length > 300) {
       final entries = keys
           .map((key) => _parsePracticeSelection(key))