diff --git a/lib/src/controller/controller.dart b/lib/src/controller/controller.dart
index ade24626..2187d2a5 100644
--- a/lib/src/controller/controller.dart
+++ b/lib/src/controller/controller.dart
@@ -656,7 +656,7 @@ class AppController with ChangeNotifier {
       case ServerSoftware.mbin:
         final credentials = _accounts[account]?.oauth;
         if (credentials != null) {
-          final identifier = _servers[instance]!.oauthIdentifier!;
+          final identifier = _servers[instance]!.oauthIdentifier;
           httpClient = oauth2.Client(
             credentials,
             identifier: identifier,
diff --git a/lib/src/controller/database/database.dart b/lib/src/controller/database/database.dart
index 58471793..2e9a3907 100644
--- a/lib/src/controller/database/database.dart
+++ b/lib/src/controller/database/database.dart
@@ -460,6 +460,7 @@ class InterstellarDatabase extends _$InterstellarDatabase {
             schema.profiles,
             schema.profiles.hideEmojiReactions,
           );
+          await invalidateOauth();
         },
       ),
     );
@@ -487,6 +488,12 @@ class InterstellarDatabase extends _$InterstellarDatabase {
       ),
     );
   }
+
+  Future<void> invalidateOauth() async {
+    await (update(servers)
+      ..where((f) => f.oauthIdentifier.isNotNull()))
+        .write(ServersCompanion(oauthIdentifier: Value(null)));
+  }
 }
 
 late InterstellarDatabase database;