diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp
index 6a22b0de..d1c7d4e2 100644
--- a/src/d3d9/d3d9_swapchain.cpp
+++ b/src/d3d9/d3d9_swapchain.cpp
@@ -1498,10 +1498,11 @@ namespace dxvk {
       ? (WNDPROC)GetWindowLongPtrW(m_window, GWLP_WNDPROC)
       : (WNDPROC)GetWindowLongPtrA(m_window, GWLP_WNDPROC);
 
-    if (proc == D3D9WindowProc && it->second.unicode)
-      SetWindowLongPtrW(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc);
-    else if (proc == D3D9WindowProc && !it->second.unicode)
-      SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc);
+    if (proc == D3D9WindowProc) {
+      it->second.unicode
+        ? SetWindowLongPtrW(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc)
+        : SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc);
+    }
 
     g_windowProcMap.erase(m_window);
   }