diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
index 1cfc1f8ff..c74036832 100644
--- a/lib/utils/background_push.dart
+++ b/lib/utils/background_push.dart
@@ -217,7 +217,7 @@ class BackgroundPush {
 
   Future<void> setupPush() async {
     await setupLocalNotificationsPlugin();
-    if (_loginState != LoginState.logged ||
+    if (_loginState != LoginState.loggedIn ||
         !PlatformInfos.isMobile ||
         context == null) {
       return;
diff --git a/lib/widgets/layouts/loading_view.dart b/lib/widgets/layouts/loading_view.dart
index 22be13f73..fa755065b 100644
--- a/lib/widgets/layouts/loading_view.dart
+++ b/lib/widgets/layouts/loading_view.dart
@@ -10,7 +10,7 @@ class LoadingView extends StatelessWidget {
     if (Matrix.of(context).loginState != null) {
       WidgetsBinding.instance.addPostFrameCallback(
         (_) => VRouter.of(context).to(
-          Matrix.of(context).loginState == LoginState.logged
+          Matrix.of(context).loginState == LoginState.loggedIn
               ? '/rooms'
               : '/home',
           queryParameters: VRouter.of(context).queryParameters,
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index deed2edf3..e86fc2de1 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -330,9 +330,9 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
         final isInLoginRoutes = {'/home', '/login', '/signup'}
             .contains(widget.router.currentState.url);
         if (widget.router.currentState.url == '/' ||
-            (state == LoginState.logged) == isInLoginRoutes) {
+            (state == LoginState.loggedIn) == isInLoginRoutes) {
           widget.router.currentState.to(
-            loginState == LoginState.logged ? '/rooms' : '/home',
+            loginState == LoginState.loggedIn ? '/rooms' : '/home',
             queryParameters: widget.router.currentState.queryParameters,
           );
         }
diff --git a/pubspec.lock b/pubspec.lock
index 8915c87c6..57fe6b47e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -722,14 +722,14 @@ packages:
       name: matrix
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.3.0"
   matrix_api_lite:
     dependency: transitive
     description:
       name: matrix_api_lite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.4.1"
   matrix_link_text:
     dependency: "direct main"
     description:
@@ -758,13 +758,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
-  moor:
-    dependency: transitive
-    description:
-      name: moor
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.2.1"
   move_to_background:
     dependency: transitive
     description:
@@ -1248,13 +1241,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0+2"
-  sqlite3:
-    dependency: transitive
-    description:
-      name: sqlite3
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   stack_trace:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7567323ee..f139a95ff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,7 @@ dependencies:
   intl: any
   localstorage: ^4.0.0+1
   lottie: ^1.1.0
-  matrix: ^0.2.1
+  matrix: ^0.3.0
   matrix_link_text: ^0.4.2
   native_imaging:
     git: https://gitlab.com/famedly/libraries/native_imaging.git