diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp
index dc5ee61c3..e83da4f78 100644
--- a/src/d3d9/d3d9_swapchain.cpp
+++ b/src/d3d9/d3d9_swapchain.cpp
@@ -94,6 +94,9 @@ namespace dxvk {
         DefWindowProcW, DefWindowProcA, unicode,
           window, message, wparam, lparam);
 
+    if (message == WM_DESTROY)
+      ResetWindowProc(window);
+
     return CallCharsetFunction(
       CallWindowProcW, CallWindowProcA, unicode,
         windowData.proc, window, message, wparam, lparam);