diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 4053bbb01..2fced0f79 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -333,7 +333,7 @@ class _SpaceViewState extends State<SpaceView> {
     if (roomType == null) return;
 
     // #Pangea
-    final RoomResponse? response = await showDialog<RoomResponse>(
+    final RoomResponse? response = await showDialog<RoomResponse?>(
       context: context,
       builder: (context) {
         return AddRoomDialog(
diff --git a/lib/pangea/pages/sign_up/signup.dart b/lib/pangea/pages/sign_up/signup.dart
index f62108027..7ec5ac1a4 100644
--- a/lib/pangea/pages/sign_up/signup.dart
+++ b/lib/pangea/pages/sign_up/signup.dart
@@ -6,6 +6,7 @@ import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:matrix/matrix_api_lite/model/matrix_exception.dart';
 
 class SignupPage extends StatefulWidget {
   const SignupPage({super.key});
@@ -137,6 +138,10 @@ class SignupPageController extends State<SignupPage> {
           displayname,
         );
       }
+    } on MatrixException catch (e) {
+      if (e.error != MatrixError.M_THREEPID_IN_USE) {
+        rethrow;
+      }
     } catch (e, s) {
       //#Pangea
       const cancelledString = "Exception: Request has been canceled";