diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp
index 87018b72..87214c72 100644
--- a/src/dxvk/dxvk_device.cpp
+++ b/src/dxvk/dxvk_device.cpp
@@ -20,7 +20,7 @@ namespace dxvk {
     m_memory            (new DxvkMemoryAllocator    (this)),
     m_renderPassPool    (new DxvkRenderPassPool     (vkd)),
     m_pipelineManager   (new DxvkPipelineManager    (this, m_renderPassPool.ptr())),
-    m_gpuEventPool      (new DxvkGpuEventPool       (vkd)),
+    m_gpuEventPool      (new DxvkGpuEventPool       (this)),
     m_gpuQueryPool      (new DxvkGpuQueryPool       (this)),
     m_metaClearObjects  (new DxvkMetaClearObjects   (this)),
     m_metaCopyObjects   (new DxvkMetaCopyObjects    (this)),
diff --git a/src/dxvk/dxvk_gpu_event.cpp b/src/dxvk/dxvk_gpu_event.cpp
index e2dac1c4..55a5004c 100644
--- a/src/dxvk/dxvk_gpu_event.cpp
+++ b/src/dxvk/dxvk_gpu_event.cpp
@@ -1,4 +1,5 @@
 #include "dxvk_gpu_event.h"
+#include "dxvk_device.h"
 
 namespace dxvk {
 
@@ -35,8 +36,8 @@ namespace dxvk {
 
 
 
-  DxvkGpuEventPool::DxvkGpuEventPool(const Rc<vk::DeviceFn>& vkd)
-  : m_vkd(vkd) { }
+  DxvkGpuEventPool::DxvkGpuEventPool(const DxvkDevice* device)
+  : m_vkd(device->vkd()) { }
 
 
   DxvkGpuEventPool::~DxvkGpuEventPool() {
diff --git a/src/dxvk/dxvk_gpu_event.h b/src/dxvk/dxvk_gpu_event.h
index b52e9f4d..d25394cf 100644
--- a/src/dxvk/dxvk_gpu_event.h
+++ b/src/dxvk/dxvk_gpu_event.h
@@ -6,6 +6,7 @@
 
 namespace dxvk {
 
+  class DxvkDevice;
   class DxvkGpuEventPool;
 
   /**
@@ -87,7 +88,7 @@ namespace dxvk {
   
   public:
 
-    DxvkGpuEventPool(const Rc<vk::DeviceFn>& vkd);
+    DxvkGpuEventPool(const DxvkDevice* device);
     ~DxvkGpuEventPool();
 
     /**