diff --git a/lib/main.dart b/lib/main.dart
index 846c34d23..05e4ca5cc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pangea/config/environment.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
@@ -106,11 +105,11 @@ Future<void> startGui(List<Client> clients, SharedPreferences store) async {
   // errors seems to happen a lot when users switch better production / staging
   // while testing by accident. If the account is a production account but server is
   // staging or vice versa, logout.
-  final isStagingUser = firstClient?.userID?.domain?.contains("staging");
-  final isStagingServer = Environment.isStaging;
-  if (isStagingServer != isStagingUser) {
-    await firstClient?.logout();
-  }
+  // final isStagingUser = firstClient?.userID?.domain?.contains("staging");
+  // final isStagingServer = Environment.isStaging;
+  // if (isStagingServer != isStagingUser) {
+  //   await firstClient?.logout();
+  // }
   // Pangea#
 
   runApp(FluffyChatApp(clients: clients, pincode: pin, store: store));