diff --git a/neo/libs/optick/optick_core.h b/neo/libs/optick/optick_core.h
index ba4e319c..b53d6682 100644
--- a/neo/libs/optick/optick_core.h
+++ b/neo/libs/optick/optick_core.h
@@ -342,6 +342,9 @@ struct ThreadEntry
 		{
 			*threadTLS = nullptr;
         }
+
+		// SRS - make sure thread storage is empty before thread entry terminates
+		storage.Clear(false);
     }
 	void Activate(Mode::Type mode);
 	void Sort();