diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
index 778b13018d..83e04b14d1 100644
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
@@ -24,7 +24,7 @@ pub trait Perform {
 }
 
 /// Converts the captcha to a base64 encoded wav audio file
-pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> Result<String, Box<dyn std::error::Error>> {
+pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> Result<String, LemmyError> {
   let letters = captcha.as_wav();
 
   // Decode each wav file, concatenate the samples
@@ -34,12 +34,19 @@ pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> Result<String, Box<dyn
     let mut cursor = Cursor::new(letter.unwrap_or_default());
     let (header, samples) = wav::read(&mut cursor)?;
     any_header = Some(header);
-    concat_samples.extend(samples.as_sixteen().ok_or("Expected 16-bit samples")?);
+    let samples16 = samples.as_sixteen();
+    if samples16.is_none() {
+      return Err(LemmyError::from_message("couldnt_create_audio_captcha"));
+    }
+    concat_samples.extend(samples16.unwrap());
   }
 
   // Encode the concatenated result as a wav file
   let mut output_buffer = Cursor::new(vec![]);
-  let _ = wav::write(any_header.ok_or("No valid letters")?,
+  if any_header.is_none() {
+    return Err(LemmyError::from_message("couldnt_create_audio_captcha"));
+  }
+  let _ = wav::write(any_header.unwrap(),
                      &wav::BitDepth::Sixteen(concat_samples),
                      &mut output_buffer);
 
diff --git a/crates/api/src/local_user/get_captcha.rs b/crates/api/src/local_user/get_captcha.rs
index 30ac18a6c0..92653cfc6c 100644
--- a/crates/api/src/local_user/get_captcha.rs
+++ b/crates/api/src/local_user/get_captcha.rs
@@ -10,7 +10,6 @@ use lemmy_db_schema::source::{
   local_site::LocalSite,
 };
 use lemmy_utils::error::LemmyError;
-use tracing::error;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetCaptcha {
@@ -34,10 +33,7 @@ impl Perform for GetCaptcha {
 
     let png = captcha.as_base64().expect("failed to generate captcha");
 
-    let wav = captcha_as_wav_base64(&captcha).unwrap_or_else(|err| {
-      error!("failed to generate audio captcha {}", err);
-      String::new()
-    });
+    let wav = captcha_as_wav_base64(&captcha)?;
 
     let captcha_form: CaptchaAnswerForm = CaptchaAnswerForm { answer };
     // Stores the captcha item in the db