diff --git a/renderdoc/driver/ihv/intel/intel_counters.cpp b/renderdoc/driver/ihv/intel/intel_counters.cpp
index 2c8565f19..28d0c0042 100644
--- a/renderdoc/driver/ihv/intel/intel_counters.cpp
+++ b/renderdoc/driver/ihv/intel/intel_counters.cpp
@@ -45,14 +45,17 @@ IntelCounters::~IntelCounters()
 {
   SAFE_RELEASE(m_deviceContext);
 
-  if(CloseMetricsDevice)
-  {
+  if(CloseMetricsDevice && m_metricsDevice)
     CloseMetricsDevice(m_metricsDevice);
-    m_metricsDevice = NULL;
-  }
+
+  m_metricsDevice = NULL;
 
   if(m_MDLibraryHandle)
     FreeLibrary(m_MDLibraryHandle);
+
+  m_MDLibraryHandle = (HMODULE)0;
+  OpenMetricsDevice = NULL;
+  CloseMetricsDevice = NULL;
 }
 
 void IntelCounters::Load()
@@ -95,8 +98,11 @@ bool IntelCounters::Init(void *pContext)
   {
     CloseMetricsDevice(m_metricsDevice);
     FreeLibrary(m_MDLibraryHandle);
+
     m_metricsDevice = NULL;
     m_MDLibraryHandle = (HMODULE)0;
+    OpenMetricsDevice = NULL;
+    CloseMetricsDevice = NULL;
     return false;
   }