diff --git a/Cargo.toml b/Cargo.toml
index bce3dcf40f8..84a47d8dfa0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,6 +29,7 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
 dep_time = { version = "0.3.20", package = "time", features = ["formatting", "parsing", "serde-well-known"] }
 base64 = { version = "0.21" }
 secrecy = { version = "0.8.0", features = ["serde"] }
+arrayvec = { version = "0.7.3", features = ["serde"] }
 # Optional dependencies
 fxhash = { version = "0.2.1", optional = true }
 simd-json = { version = "0.7", optional = true }
diff --git a/src/model/misc.rs b/src/model/misc.rs
index a16f42987ac..7f476196035 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -111,8 +111,7 @@ impl serde::Serialize for ImageHash {
 
 impl<'de> serde::Deserialize<'de> for ImageHash {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        // TODO: Replace this with ArrayString<34>?
-        let helper = String::deserialize(deserializer)?;
+        let helper = arrayvec::ArrayString::<34>::deserialize(deserializer)?;
         Self::from_str(&helper).map_err(serde::de::Error::custom)
     }
 }