diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 188fcf68b..8df304f33 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -887,6 +887,7 @@ class ChatController extends State<ChatPageWithRoom>
         }
       },
     ).catchError((err, s) {
+      clearFakeEvent();
       if (err is EventTooLarge) {
         showAdaptiveDialog(
           context: context,
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index dc5846036..fd199d5b7 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -496,8 +496,9 @@ class InputBar extends StatelessWidget {
           builder: (context, _, focusNode) {
             final textField = TextField(
               enableSuggestions: enableAutocorrect,
-              readOnly:
-                  controller != null && controller!.choreographer.isRunningIT,
+              readOnly: controller != null &&
+                  (controller!.choreographer.isRunningIT ||
+                      controller!.choreographer.chatController.obscureText),
               autocorrect: enableAutocorrect,
               controller: (controller
                           ?.choreographer.chatController.obscureText) ??