diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index b2cdc9f47..3e0413230 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -328,7 +328,6 @@ class ChatController extends State<ChatPageWithRoom>
         );
       }
       await Matrix.of(context).client.roomsLoading;
-      choreographer.setRoomId(roomId);
     });
     // Pangea#
     _tryLoadTimeline();
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index 84a802e54..61ce641fc 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -463,7 +463,7 @@ class InputBar extends StatelessWidget {
             debounceDuration: const Duration(milliseconds: 50),
             // show suggestions after 50ms idle time (default is 300)
             // #Pangea
-            key: controller!.choreographer.inputLayerLinkAndKey.key,
+            key: controller?.choreographer.inputLayerLinkAndKey.key,
             // builder: (context, controller, focusNode) => TextField(
             builder: (context, _, focusNode) => TextField(
               // Pangea#
@@ -504,11 +504,11 @@ class InputBar extends StatelessWidget {
                 onSubmitted!(text);
               },
               // #Pangea
-              style: controller?.isMaxLength ?? false
+              style: controller?.exceededMaxLength ?? false
                   ? const TextStyle(color: Colors.red)
                   : null,
               onTap: () {
-                controller!.onInputTap(
+                controller?.onInputTap(
                   context,
                   fNode: focusNode,
                 );
diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart
index dd2078fa2..c3cd0ab09 100644
--- a/lib/pangea/choreographer/controllers/choreographer.dart
+++ b/lib/pangea/choreographer/controllers/choreographer.dart
@@ -42,7 +42,6 @@ class Choreographer {
 
   bool isFetching = false;
   Timer? debounceTimer;
-  String? _roomId;
   ChoreoRecord choreoRecord = ChoreoRecord.newRecord;
   // last checked by IGC or translation
   String? _lastChecked;
@@ -464,10 +463,7 @@ class Choreographer {
     setState();
   }
 
-  get roomId => _roomId;
-  void setRoomId(String? roomId) {
-    _roomId = roomId ?? '';
-  }
+  get roomId => chatController.roomId;
 
   bool get _useCustomInput => [
         EditType.keyboard,
diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart
index 8fc136edd..63c5b3f94 100644
--- a/lib/pangea/widgets/igc/pangea_text_controller.dart
+++ b/lib/pangea/widgets/igc/pangea_text_controller.dart
@@ -27,7 +27,7 @@ class PangeaTextController extends TextEditingController {
   }
 
   static const int maxLength = 1000;
-  bool get isMaxLength => text.length == 1000;
+  bool get exceededMaxLength => text.length >= maxLength;
 
   bool forceKeepOpen = false;