diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index 90a2bbf22..0e17af0ec 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -74,6 +74,9 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
       widget.clients.indexWhere((client) => client.userID == matrixId);
 
   int get _safeActiveClient {
+    if (widget.clients.isEmpty) {
+      widget.clients.add(getLoginClient());
+    }
     if (activeClient < 0 || activeClient >= widget.clients.length) {
       return 0;
     }