diff --git a/crates/threshold-signature-server/src/attestation/api.rs b/crates/threshold-signature-server/src/attestation/api.rs
index 8ab443ab5..d043e149a 100644
--- a/crates/threshold-signature-server/src/attestation/api.rs
+++ b/crates/threshold-signature-server/src/attestation/api.rs
@@ -186,7 +186,8 @@ pub async fn create_quote(
         context,
     );
 
-    Ok(configfs_tsm::create_quote(input_data.0)?)
+    Ok(configfs_tsm::create_quote(input_data.0)
+        .map_err(|e| AttestationErr::QuoteGeneration(format!("{:?}", e)))?)
 }
 
 /// Querystring for the GET `/attest` endpoint
diff --git a/crates/threshold-signature-server/src/attestation/errors.rs b/crates/threshold-signature-server/src/attestation/errors.rs
index e0c937870..a78f3d7b4 100644
--- a/crates/threshold-signature-server/src/attestation/errors.rs
+++ b/crates/threshold-signature-server/src/attestation/errors.rs
@@ -39,7 +39,7 @@ pub enum AttestationErr {
     Codec(#[from] parity_scale_codec::Error),
     #[cfg(feature = "production")]
     #[error("Quote generation: {0}")]
-    QuoteGeneration(#[from] configfs_tsm::QuoteGenerationError),
+    QuoteGeneration(&'static str),
     #[error("Vec<u8> Conversion Error: {0}")]
     Conversion(&'static str),
     #[error("Data is repeated")]