diff --git a/src/api/publish.rs b/src/api/publish.rs
index 7e15b0f7..a650223b 100644
--- a/src/api/publish.rs
+++ b/src/api/publish.rs
@@ -229,7 +229,7 @@ pub(crate) async fn put(mut req: Request<State>) -> Result<Response, Error> {
                 .collect(),
             cksum: hash,
             features: metadata.features,
-            yanked: Some(false),
+            yanked: false,
             links: metadata.links,
         };
 
diff --git a/src/index/mod.rs b/src/index/mod.rs
index 82c27f6f..0dc98b68 100644
--- a/src/index/mod.rs
+++ b/src/index/mod.rs
@@ -52,11 +52,11 @@ pub trait Indexer {
         F: FnOnce(&mut CrateVersion);
     /// Yanks a crate version.
     fn yank_record(&self, name: &str, version: Version) -> Result<(), Error> {
-        self.alter_record(name, version, |krate| krate.yanked = Some(true))
+        self.alter_record(name, version, |krate| krate.yanked = true)
     }
     /// Un-yanks a crate version.
     fn unyank_record(&self, name: &str, version: Version) -> Result<(), Error> {
-        self.alter_record(name, version, |krate| krate.yanked = Some(false))
+        self.alter_record(name, version, |krate| krate.yanked = false)
     }
 }
 
diff --git a/src/index/models.rs b/src/index/models.rs
index 257b9950..ddce8dda 100644
--- a/src/index/models.rs
+++ b/src/index/models.rs
@@ -27,7 +27,8 @@ pub struct CrateVersion {
     pub features: HashMap<String, Vec<String>>,
 
     /// Is the crate yanked.
-    pub yanked: Option<bool>,
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub yanked: bool,
 
     /// Is the crate yanked.
     #[serde(skip_serializing_if = "Option::is_none", default)]