diff --git a/crates/torii/grpc/src/server/mod.rs b/crates/torii/grpc/src/server/mod.rs
index b4fec0933e..3d0f8cbd81 100644
--- a/crates/torii/grpc/src/server/mod.rs
+++ b/crates/torii/grpc/src/server/mod.rs
@@ -132,7 +132,7 @@ impl DojoWorld {
                 contract_address: model.3,
                 packed_size: model.4,
                 unpacked_size: model.5,
-                layout: hex::decode(&model.6).unwrap(),
+                layout: model.6.as_bytes().to_vec(),
                 schema: serde_json::to_vec(&schema).unwrap(),
             });
         }
@@ -474,7 +474,7 @@ impl DojoWorld {
         .await?;
 
         let schema = self.model_cache.schema(&model).await?;
-        let layout = hex::decode(&layout).unwrap();
+        let layout = layout.as_bytes().to_vec();
 
         Ok(proto::types::ModelMetadata {
             name,