diff --git a/modules/juce_audio_devices/native/juce_win32_Midi.cpp b/modules/juce_audio_devices/native/juce_win32_Midi.cpp
index 76cd261395..ea16479993 100644
--- a/modules/juce_audio_devices/native/juce_win32_Midi.cpp
+++ b/modules/juce_audio_devices/native/juce_win32_Midi.cpp
@@ -81,7 +81,10 @@ public:
             activeMidiCollectors.addIfNotAlreadyThere (this);
 
             for (int i = 0; i < (int) numHeaders; ++i)
+            {
+                headers[i].prepare (deviceHandle);
                 headers[i].write (deviceHandle);
+            }
 
             startTime = Time::getMillisecondCounterHiRes();
             MMRESULT res = midiInStart (deviceHandle);
@@ -139,29 +142,15 @@ private:
     class MidiHeader
     {
     public:
-        MidiHeader()
+        MidiHeader() {}
+
+        void prepare (HMIDIIN deviceHandle)
         {
             zerostruct (hdr);
             hdr.lpData = data;
             hdr.dwBufferLength = (DWORD) numElementsInArray (data);
-        }
 
-        void write (HMIDIIN deviceHandle)
-        {
-            hdr.dwBytesRecorded = 0;
-            MMRESULT res = midiInPrepareHeader (deviceHandle, &hdr, sizeof (hdr));
-            res = midiInAddBuffer (deviceHandle, &hdr, sizeof (hdr));
-            (void) res;
-        }
-
-        void writeIfFinished (HMIDIIN deviceHandle)
-        {
-            if ((hdr.dwFlags & WHDR_DONE) != 0)
-            {
-                MMRESULT res = midiInUnprepareHeader (deviceHandle, &hdr, sizeof (hdr));
-                (void) res;
-                write (deviceHandle);
-            }
+            midiInPrepareHeader (deviceHandle, &hdr, sizeof (hdr));
         }
 
         void unprepare (HMIDIIN deviceHandle)
@@ -176,6 +165,18 @@ private:
             }
         }
 
+        void write (HMIDIIN deviceHandle)
+        {
+            hdr.dwBytesRecorded = 0;
+            midiInAddBuffer (deviceHandle, &hdr, sizeof (hdr));
+        }
+
+        void writeIfFinished (HMIDIIN deviceHandle)
+        {
+            if ((hdr.dwFlags & WHDR_DONE) != 0)
+                write (deviceHandle);
+        }
+
     private:
         MIDIHDR hdr;
         char data [256];