diff --git a/java/src/org/futo/inputmethod/latin/uix/voiceinput/downloader/DownloadActivity.kt b/java/src/org/futo/inputmethod/latin/uix/voiceinput/downloader/DownloadActivity.kt
index f69408ca7..bc9c90355 100644
--- a/java/src/org/futo/inputmethod/latin/uix/voiceinput/downloader/DownloadActivity.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/voiceinput/downloader/DownloadActivity.kt
@@ -256,6 +256,8 @@ class DownloadActivity : ComponentActivity() {
 
     private val themeOption: MutableState<ThemeOption?> = mutableStateOf(null)
     private fun updateContent() {
+        // TODO: In some cases seems to cause a crash?
+        // May be related https://github.com/mozilla-mobile/focus-android/issues/7712
         setContent {
             themeOption.value?.let { themeOption ->
                 val themeIdx = useDataStore(key = THEME_KEY.key, default = themeOption.key)
diff --git a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/util/AudioFeatureExtraction.kt b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/util/AudioFeatureExtraction.kt
index 7b007341c..f0fc4d28d 100644
--- a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/util/AudioFeatureExtraction.kt
+++ b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/util/AudioFeatureExtraction.kt
@@ -209,7 +209,7 @@ class AudioFeatureExtraction(
      * This function converts input audio samples to 1x80x3000 features
      */
     fun melSpectrogram(y: DoubleArray): FloatArray {
-        val paddedWaveform = DoubleArray(min(numSamples, y.size + hopLength)) {
+        val paddedWaveform = DoubleArray(min(numSamples, y.size + hopLength).coerceAtLeast(nFFT)) {
             if (it < y.size) {
                 y[it]
             } else {
diff --git a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/whisper/MelProcessor.kt b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/whisper/MelProcessor.kt
index 1db5aaadf..d3a789808 100644
--- a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/whisper/MelProcessor.kt
+++ b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/whisper/MelProcessor.kt
@@ -12,11 +12,5 @@ private val extractor = AudioFeatureExtraction(
 )
 
 fun extractMelSpectrogramForWhisper(samples: DoubleArray): FloatArray {
-    val paddedSamples = if(samples.size <= 640) {
-        samples + DoubleArray(640) { 0.0 }
-    } else {
-        samples
-    }
-    
-    return extractor.melSpectrogram(paddedSamples)
+    return extractor.melSpectrogram(samples)
 }
\ No newline at end of file