diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index db331aa1..e719a133 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -451,7 +451,8 @@ class _ChatState extends State<_Chat> {
     if (_collapseRoomCreate &&
         filteredEvents[filteredEvents.length - 1].type ==
             EventTypes.RoomCreate) {
-      while (filteredEvents[filteredEvents.length - 2].senderId ==
+      while (filteredEvents.length >= 3 &&
+          filteredEvents[filteredEvents.length - 2].senderId ==
               filteredEvents[filteredEvents.length - 1].senderId &&
           ![EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted]
               .contains(filteredEvents[filteredEvents.length - 2].type)) {
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index 5036510e..da259751 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -121,15 +121,20 @@ class _SettingsState extends State<Settings> {
   }
 
   void setJitsiInstanceAction(BuildContext context) async {
+    const prefix = 'https://';
     var input = await showTextInputDialog(
       context: context,
       title: L10n.of(context).editJitsiInstance,
       textFields: [
-        DialogTextField(initialText: Matrix.of(context).jitsiInstance),
+        DialogTextField(
+          initialText:
+              Matrix.of(context).jitsiInstance.replaceFirst(prefix, ''),
+          prefixText: prefix,
+        ),
       ],
     );
     if (input == null) return;
-    var jitsi = input.single;
+    var jitsi = prefix + input.single;
     if (!jitsi.endsWith('/')) {
       jitsi += '/';
     }