diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index fbfaca9e..307110da 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -596,9 +596,11 @@ namespace dxvk {
     uint64_t value = ++m_eventCount;
 
     if (m_eventSignal == nullptr)
-      m_eventSignal = new sync::Win32Fence();
+      m_eventSignal = new sync::CallbackFence();
 
-    m_eventSignal->setEvent(hEvent, value);
+    m_eventSignal->setCallback(value, [hEvent] {
+      SetEvent(hEvent);
+    });
 
     EmitCs([
       cSignal = m_eventSignal,
diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h
index e23fe2b4..ae57cfb1 100644
--- a/src/d3d11/d3d11_context_imm.h
+++ b/src/d3d11/d3d11_context_imm.h
@@ -2,7 +2,7 @@
 
 #include "../util/util_time.h"
 
-#include "../util/sync/sync_signal_win32.h"
+#include "../util/sync/sync_signal.h"
 
 #include "d3d11_context.h"
 #include "d3d11_state_object.h"
@@ -118,8 +118,8 @@ namespace dxvk {
     DxvkCsThread m_csThread;
     bool         m_csIsBusy = false;
 
-    Rc<sync::Win32Fence> m_eventSignal;
-    uint64_t             m_eventCount = 0;
+    Rc<sync::CallbackFence> m_eventSignal;
+    uint64_t                m_eventCount = 0;
 
     dxvk::high_resolution_clock::time_point m_lastFlush
       = dxvk::high_resolution_clock::now();