1 files changed, 5 insertions, 1 deletions
diff --git a/src/vm/eventpipeconfiguration.cpp b/src/vm/eventpipeconfiguration.cpp
index 6206bbc74f..d787956c7c 100644
--- a/src/vm/eventpipeconfiguration.cpp
+++ b/src/vm/eventpipeconfiguration.cpp
@@ -19,6 +19,7 @@ EventPipeConfiguration::EventPipeConfiguration()
 
     m_enabled = false;
     m_rundownEnabled = false;
+    m_pRundownThread = NULL;
     m_pConfigProvider = NULL;
     m_pSession = NULL;
     m_pProviderList = new SList<SListElem<EventPipeProvider*>>();
@@ -409,6 +410,7 @@ void EventPipeConfiguration::Disable(EventPipeSession *pSession)
 
     m_enabled = false;
     m_rundownEnabled = false;
+    m_pRundownThread = NULL;
     m_pSession = NULL;
 }
 
@@ -440,8 +442,10 @@ void EventPipeConfiguration::EnableRundown(EventPipeSession *pSession)
     // Build the rundown configuration.
     _ASSERTE(m_pSession == NULL);
 
-    // Enable rundown.
+    // Enable rundown and keep track of the rundown thread.
     // TODO: Move this into EventPipeSession once Enable takes an EventPipeSession object.
+    m_pRundownThread = GetThread();
+    _ASSERTE(m_pRundownThread != NULL);
     m_rundownEnabled = true;
 
     // Enable tracing.