diff --git a/src/wx/audio/internal/faudio.cpp b/src/wx/audio/internal/faudio.cpp
index 2fbe798b..c4b91edc 100644
--- a/src/wx/audio/internal/faudio.cpp
+++ b/src/wx/audio/internal/faudio.cpp
@@ -178,7 +178,10 @@ void FAudio_Output::close() {
             VBAM_CHECK(FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW) == 0);
         }
 
-        FAudioVoice_DestroyVoice(sVoice);
+        if ((sVoice != (FAudioMasteringVoice*)0xDDDDDDDDDDDDDDDD) && (sVoice)) {
+            FAudioVoice_DestroyVoice(sVoice);
+        }
+        
         sVoice = nullptr;
     }
 
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index ba76adae..ac3d2429 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -2412,6 +2412,8 @@ void SDLDrawingPanel::DrawingPanelInit()
         systemScreenMessage(_("Failed to set OpenGL properties"));
     }
 
+    SDL_SetHint(SDL_HINT_WINDOWS_USE_D3D9EX, false);
+
     sdlwindow = SDL_CreateWindowWithProperties(props);
 
     if (sdlwindow == NULL) {