diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 47e89a1f45..d84c3e8b85 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -562,7 +562,10 @@ public:
                     return true;
                 }
             }
-
+            // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock.
+            // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled.
+            // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used
+#if 0
             if (message->message == WM_DEVICECHANGE) {
                 const float MIN_DELTA_SECONDS = 2.0f; // de-bounce signal
                 static float lastTriggerTime = 0.0f;
@@ -572,6 +575,7 @@ public:
                     Midi::USBchanged();                // re-scan the MIDI bus
                 }
             }
+#endif
         }
         return false;
     }
diff --git a/libraries/midi/src/Midi.cpp b/libraries/midi/src/Midi.cpp
index 7f75b3bfb9..25689e8bd3 100644
--- a/libraries/midi/src/Midi.cpp
+++ b/libraries/midi/src/Midi.cpp
@@ -187,38 +187,43 @@ void Midi::MidiSetup() {
 
     MIDIINCAPS incaps;
     for (unsigned int i = 0; i < midiInGetNumDevs(); i++) {
-        midiInGetDevCaps(i, &incaps, sizeof(MIDIINCAPS));
+        if (MMSYSERR_NOERROR == midiInGetDevCaps(i, &incaps, sizeof(MIDIINCAPS))) {
 
-        bool found = false;
-        for (int j = 0; j < midiInExclude.size(); j++) {
-            if (midiInExclude[j].toStdString().compare(incaps.szPname) == 0) {
-                found = true;
-                break;
+            bool found = false;
+            for (int j = 0; j < midiInExclude.size(); j++) {
+                if (midiInExclude[j].toStdString().compare(incaps.szPname) == 0) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {        // EXCLUDE AN INPUT BY NAME
+                HMIDIIN tmphin;
+                if (MMSYSERR_NOERROR == midiInOpen(&tmphin, i, (DWORD_PTR)MidiInProc, NULL, CALLBACK_FUNCTION)) {
+                    if (MMSYSERR_NOERROR == midiInStart(tmphin)) {
+                        midihin.push_back(tmphin);
+                    }
+                }
             }
-        }
-        if (!found) {        // EXCLUDE AN INPUT BY NAME
-            HMIDIIN tmphin;
-            midiInOpen(&tmphin, i, (DWORD_PTR)MidiInProc, NULL, CALLBACK_FUNCTION);
-            midiInStart(tmphin);
-            midihin.push_back(tmphin);
         }
     }
 
     MIDIOUTCAPS outcaps;
     for (unsigned int i = 0; i < midiOutGetNumDevs(); i++) {
-        midiOutGetDevCaps(i, &outcaps, sizeof(MIDIINCAPS));
+        if (MMSYSERR_NOERROR == midiOutGetDevCaps(i, &outcaps, sizeof(MIDIOUTCAPS))) {
 
-        bool found = false;
-        for (int j = 0; j < midiOutExclude.size(); j++) {
-            if (midiOutExclude[j].toStdString().compare(outcaps.szPname) == 0) {
-                found = true;
-                break;
+            bool found = false;
+            for (int j = 0; j < midiOutExclude.size(); j++) {
+                if (midiOutExclude[j].toStdString().compare(outcaps.szPname) == 0) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {        // EXCLUDE AN OUTPUT BY NAME
+                HMIDIOUT tmphout;
+                if (MMSYSERR_NOERROR == midiOutOpen(&tmphout, i, (DWORD_PTR)MidiOutProc, NULL, CALLBACK_FUNCTION)) {
+                    midihout.push_back(tmphout);
+                }
             }
-        }
-        if (!found) {        // EXCLUDE AN OUTPUT BY NAME
-            HMIDIOUT tmphout;
-            midiOutOpen(&tmphout, i, (DWORD_PTR)MidiOutProc, NULL, CALLBACK_FUNCTION);
-            midihout.push_back(tmphout);
         }
     }