diff --git a/modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp
index 746ce640ba..cc22f41a03 100644
--- a/modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp
@@ -166,6 +166,9 @@ public:
 
         checkCoInitialiseCalled();
 
+        clearSamplesBeyondAvailableLength (destSamples, numDestChannels, startOffsetInDestBuffer,
+                                           startSampleInFile, numSamples, lengthInSamples);
+
         const int stride = numChannels * sizeof (int16);
 
         while (numSamples > 0)
@@ -297,7 +300,7 @@ private:
 
                             sampleRate = inputFormat->nSamplesPerSec;
                             numChannels = inputFormat->nChannels;
-                            bitsPerSample = inputFormat->wBitsPerSample;
+                            bitsPerSample = inputFormat->wBitsPerSample != 0 ? inputFormat->wBitsPerSample : 16;
                             lengthInSamples = (lengthInNanoseconds * (int) sampleRate) / 10000000;
                         }
                     }