diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart
index 1fcdd8e8..74520ab6 100644
--- a/lib/components/matrix.dart
+++ b/lib/components/matrix.dart
@@ -322,6 +322,10 @@ class MatrixState extends State<Matrix> {
         'im.ponies.room_emotes', // we want emotes to work properly
       },
       databaseBuilder: getDatabase,
+      supportedLoginTypes: {
+        AuthenticationTypes.password,
+        if (PlatformInfos.isMobile) AuthenticationTypes.sso
+      },
     );
     LoadingDialog.defaultTitle = L10n.of(context).loadingPleaseWait;
     LoadingDialog.defaultBackLabel = L10n.of(context).close;
diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart
index 480c4c6a..3101ddf4 100644
--- a/lib/views/homeserver_picker.dart
+++ b/lib/views/homeserver_picker.dart
@@ -30,22 +30,8 @@ class _HomeserverPickerState extends State<HomeserverPicker> {
 
     setState(() => _isLoading = true);
 
-    // Look up well known
     try {
-      final wellKnown = await MatrixApi(homeserver: Uri.parse(homeserver))
-          .requestWellKnownInformations();
-      homeserver = wellKnown.mHomeserver.baseUrl;
-    } catch (e) {
-      Logs().v('Found no well known information', e);
-    }
-
-    try {
-      await Matrix.of(context)
-          .client
-          .checkHomeserver(homeserver, supportedLoginTypes: {
-        AuthenticationTypes.password,
-        if (PlatformInfos.isMobile) AuthenticationTypes.sso
-      });
+      await Matrix.of(context).client.checkHomeserver(homeserver);
       final loginTypes = await Matrix.of(context).client.requestLoginTypes();
       if (loginTypes.flows
           .any((flow) => flow.type == AuthenticationTypes.password)) {
diff --git a/pubspec.lock b/pubspec.lock
index d379f2f5..aed3fa3f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -216,7 +216,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "4597ea344553e78a0817d7cdad16ac72079c8034"
+      resolved-ref: "6badbc327e74ed814a3d8da410b1b5c5ce2596c0"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
@@ -603,7 +603,7 @@ packages:
       name: matrix_api_lite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.6"
   matrix_file_e2ee:
     dependency: transitive
     description: