diff --git a/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart b/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart
index 768f3112e..85c120702 100644
--- a/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart
+++ b/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart
@@ -144,22 +144,7 @@ class FirestoreModelAdapter extends ModelAdapter
   }
 
   static final Set<FirestoreModelFieldValueConverter> _converters = {
-    const FirestoreModelCommandBaseConverter(),
-    const FirestoreModelCounterConverter(),
-    const FirestoreModelTimestampConverter(),
-    const FirestoreModelDateConverter(),
-    const FirestoreModelLocaleConverter(),
-    const FirestoreModelLocalizedValueConverter(),
-    const FirestoreModelUriConverter(),
-    const FirestoreModelImageUriConverter(),
-    const FirestoreModelVideoUriConverter(),
-    const FirestoreModelSearchConverter(),
-    const FirestoreModelTokenConverter(),
-    const FirestoreModelGeoValueConverter(),
-    const FirestoreModelRefConverter(),
-    const FirestoreEnumConverter(),
-    const FirestoreNullConverter(),
-    const FirestoreBasicConverter(),
+    ...FirestoreModelFieldValueConverter.defaultConverters
   };
 
   /// Options for initializing Firebase.
diff --git a/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart b/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart
index 7408be35b..11202101f 100644
--- a/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart
+++ b/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart
@@ -141,22 +141,7 @@ class ListenableFirestoreModelAdapter extends ModelAdapter
   }
 
   static final Set<FirestoreModelFieldValueConverter> _converters = {
-    const FirestoreModelCommandBaseConverter(),
-    const FirestoreModelCounterConverter(),
-    const FirestoreModelTimestampConverter(),
-    const FirestoreModelDateConverter(),
-    const FirestoreModelLocaleConverter(),
-    const FirestoreModelLocalizedValueConverter(),
-    const FirestoreModelUriConverter(),
-    const FirestoreModelImageUriConverter(),
-    const FirestoreModelVideoUriConverter(),
-    const FirestoreModelSearchConverter(),
-    const FirestoreModelTokenConverter(),
-    const FirestoreModelGeoValueConverter(),
-    const FirestoreModelRefConverter(),
-    const FirestoreEnumConverter(),
-    const FirestoreNullConverter(),
-    const FirestoreBasicConverter(),
+    ...FirestoreModelFieldValueConverter.defaultConverters
   };
 
   /// Options for initializing Firebase.