diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
index b9f3ef6366..733ae7b958 100644
--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -212,8 +212,7 @@ pub struct CipherData {
     Login = 1,
     SecureNote = 2,
     Card = 3,
-    Identity = 4,
-    Fido2Key = 5
+    Identity = 4
     */
     pub Type: i32,
     pub Name: String,
@@ -225,7 +224,6 @@ pub struct CipherData {
     SecureNote: Option<Value>,
     Card: Option<Value>,
     Identity: Option<Value>,
-    Fido2Key: Option<Value>,
 
     Favorite: Option<bool>,
     Reprompt: Option<i32>,
@@ -468,7 +466,6 @@ pub async fn update_cipher_from_data(
         2 => data.SecureNote,
         3 => data.Card,
         4 => data.Identity,
-        5 => data.Fido2Key,
         _ => err!("Invalid type"),
     };
 
diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
index 62a601973f..7df0171b56 100644
--- a/src/api/core/mod.rs
+++ b/src/api/core/mod.rs
@@ -216,7 +216,8 @@ fn config() -> Json<Value> {
           // Any feature flags that we want the clients to use
           // Can check the enabled ones at:
           // https://vault.bitwarden.com/api/config
-          "autofill-v2": true
+          "autofill-v2": true,
+          "fido2-vault-credentials": true
         },
         "object": "config",
     }))
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index 6bc98b90a3..bd3531a007 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -29,8 +29,7 @@ db_object! {
         Login = 1,
         SecureNote = 2,
         Card = 3,
-        Identity = 4,
-        Fido2key = 5
+        Identity = 4
         */
         pub atype: i32,
         pub name: String,
@@ -229,7 +228,6 @@ impl Cipher {
             "SecureNote": null,
             "Card": null,
             "Identity": null,
-            "Fido2Key": null,
         });
 
         // These values are only needed for user/default syncs
@@ -258,7 +256,6 @@ impl Cipher {
             2 => "SecureNote",
             3 => "Card",
             4 => "Identity",
-            5 => "Fido2Key",
             _ => panic!("Wrong type"),
         };