diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart
index 390150505..790bc62fe 100644
--- a/flutter/lib/models/ab_model.dart
+++ b/flutter/lib/models/ab_model.dart
@@ -347,6 +347,9 @@ class AbModel {
     if (ab == null) {
       return 'no such addressbook: $name';
     }
+    for (var p in ps) {
+      ab.removeNonExistentTags(p);
+    }
     String? errMsg = await ab.addPeers(ps);
     await pullNonLegacyAfterChange(name: name);
     if (name == _currentName.value) {
@@ -822,6 +825,18 @@ abstract class BaseAb {
     p.remove('password');
   }
 
+  removeNonExistentTags(Map<String, dynamic> p) {
+    try {
+      final oldTags = p.remove('tags');
+      if (oldTags is List) {
+        final newTags = oldTags.where((e) => tagContainBy(e)).toList();
+        p['tags'] = newTags;
+      }
+    } catch (e) {
+      print("removeNonExistentTags: $e");
+    }
+  }
+
   Future<bool> changeTagForPeers(List<String> ids, List<dynamic> tags);
 
   Future<bool> changeAlias({required String id, required String alias});