diff --git a/Src/intercept.cpp b/Src/intercept.cpp
index 4f41990a..8e8a1a81 100644
--- a/Src/intercept.cpp
+++ b/Src/intercept.cpp
@@ -178,6 +178,13 @@ CLIntercept::~CLIntercept()
     // the process is terminating, that's probably OK.
     m_Dispatch = dummyDispatch;
 
+#if defined(USE_MDAPI)
+    if( m_pMDHelper )
+    {
+        MetricsDiscovery::MDHelper::Delete( m_pMDHelper );
+    }
+#endif
+
     if( m_OpenCLLibraryHandle != NULL )
     {
         OS().UnloadLibrary( m_OpenCLLibraryHandle );