diff --git a/ml/src/tft/varmap_quantization.rs b/ml/src/tft/varmap_quantization.rs
index f26f4d09d..bdec5d66c 100644
--- a/ml/src/tft/varmap_quantization.rs
+++ b/ml/src/tft/varmap_quantization.rs
@@ -341,12 +341,12 @@ pub fn quantize_varmap_parallel(
                     // Validate and quantize
                     match validate_tensor_for_quantization(tensor, name) {
                         Ok(_) => {
-                            let mut quantizer_guard = quantizer.lock().unwrap();
+                            let mut quantizer_guard = quantizer.lock().unwrap_or_else(|e| e.into_inner());
                             match quantizer_guard.quantize_tensor(tensor, name) {
                                 Ok(quantized) => Some(quantized),
                                 Err(e) => {
                                     warn!("Failed to quantize {}: {}", name, e);
-                                    let mut skip_counters = skipped_counter.lock().unwrap();
+                                    let mut skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
                                     skip_counters.3 += 1; // error count
                                     None
                                 },
@@ -354,7 +354,7 @@ pub fn quantize_varmap_parallel(
                         },
                         Err(e) => {
                             warn!("Skipping invalid tensor {}: {}", name, e);
-                            let mut skip_counters = skipped_counter.lock().unwrap();
+                            let mut skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
                             skip_counters.3 += 1; // error count
                             None
                         },
@@ -362,26 +362,26 @@ pub fn quantize_varmap_parallel(
                 },
                 TensorCategory::Bias => {
                     debug!("Skipping bias tensor: {}", name);
-                    let mut skip_counters = skipped_counter.lock().unwrap();
+                    let mut skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
                     skip_counters.0 += 1; // bias count
                     None
                 },
                 TensorCategory::LayerNorm => {
                     debug!("Skipping LayerNorm tensor: {}", name);
-                    let mut skip_counters = skipped_counter.lock().unwrap();
+                    let mut skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
                     skip_counters.1 += 1; // layernorm count
                     None
                 },
                 TensorCategory::Small => {
                     debug!("Skipping small tensor: {}", name);
-                    let mut skip_counters = skipped_counter.lock().unwrap();
+                    let mut skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
                     skip_counters.2 += 1; // small count
                     None
                 },
             };
 
             // Update progress counter
-            let mut counter = progress_counter.lock().unwrap();
+            let mut counter = progress_counter.lock().unwrap_or_else(|e| e.into_inner());
             *counter += 1;
             let current_progress = *counter;
             drop(counter);
@@ -419,7 +419,7 @@ pub fn quantize_varmap_parallel(
     let elapsed = start_time.elapsed().as_secs_f32();
     let rate = total_tensors as f32 / elapsed;
 
-    let skip_counters = skipped_counter.lock().unwrap();
+    let skip_counters = skipped_counter.lock().unwrap_or_else(|e| e.into_inner());
     let (bias_count, layernorm_count, small_count, error_count) = *skip_counters;
 
     info!(