diff --git a/mobile/lib/infrastructure/repositories/metadata.repository.dart b/mobile/lib/infrastructure/repositories/metadata.repository.dart
index 761e8f5515..2ad59db174 100644
--- a/mobile/lib/infrastructure/repositories/metadata.repository.dart
+++ b/mobile/lib/infrastructure/repositories/metadata.repository.dart
@@ -50,6 +50,9 @@ class MetadataRepository extends DriftDatabaseRepository {
 
   Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
     if (_read(key) == value) return;
+    if (value == key.defaultValue) {
+      return delete(key);
+    }
 
     await _db
         .into(_db.metadataEntity)
diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index 5c902b56e7..b0f2ecee70 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -241,6 +241,9 @@ class _StoreMigrator {
   Future<void> complete() async {
     await _db.batch((batch) {
       for (final entry in _cache.entries) {
+        if (entry.value == entry.key.defaultValue) {
+          continue;
+        }
         batch.insert(
           _db.metadataEntity,
           MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),