diff --git a/NBitcoin/Protocol/Filters/NodeFiltersCollection.cs b/NBitcoin/Protocol/Filters/NodeFiltersCollection.cs
index 5f57381fa2..7e9b978c7e 100644
--- a/NBitcoin/Protocol/Filters/NodeFiltersCollection.cs
+++ b/NBitcoin/Protocol/Filters/NodeFiltersCollection.cs
@@ -7,7 +7,7 @@
 
 namespace NBitcoin.Protocol.Filters
 {
-	public class NodeFiltersCollection : ThreadSafeCollection<INodeFilter>
+	public class NodeFiltersCollection : ThreadSafeList<INodeFilter>
 	{
 		public IDisposable Add(Action<IncomingMessage, Action> onReceiving, Action<Node, Payload, Action> onSending = null)
 		{
diff --git a/NBitcoin/Utils/ThreadSafeList.cs b/NBitcoin/Utils/ThreadSafeList.cs
new file mode 100644
index 0000000000..dc891e9fd4
--- /dev/null
+++ b/NBitcoin/Utils/ThreadSafeList.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NBitcoin
+{ 
+	public class ThreadSafeList<T> : IEnumerable<T>
+	{
+		private List<T> _Behaviors;
+		private object _lock = new object();
+
+		private List<T> _EnumeratorList = null;
+
+		public ThreadSafeList()
+		{
+			lock (_lock)
+				_Behaviors = new List<T>();
+		}
+
+		/// <summary>
+		/// Add an item to the collection
+		/// </summary>
+		/// <param name="item"></param>
+		/// <returns>When disposed, the item is removed</returns>
+		public IDisposable Add(T item)
+		{
+			if (item == null)
+				throw new ArgumentNullException(nameof(item));
+			OnAdding(item);
+			lock (_lock)
+			{
+				_Behaviors.Add(item);
+				_EnumeratorList = null;
+			}
+			return new ActionDisposable(() =>
+			{
+			}, () => Remove(item));
+		}
+
+		protected virtual void OnAdding(T obj)
+		{
+		}
+		protected virtual void OnRemoved(T obj)
+		{
+		}
+
+		public bool Remove(T item)
+		{
+			bool removed = false;
+			lock (_lock)
+			{
+				removed = _Behaviors.Remove(item);
+				_EnumeratorList = null;
+			}
+
+			if (removed)
+				OnRemoved(item);
+			return removed;
+		}
+
+		public void Clear()
+		{
+			foreach (var behavior in this)
+				Remove(behavior);
+		}
+
+		public T FindOrCreate<U>() where U : T, new()
+		{
+			return FindOrCreate<U>(() => new U());
+		}
+		public U FindOrCreate<U>(Func<U> create) where U : T
+		{
+			var result = this.OfType<U>().FirstOrDefault();
+			if (result == null)
+			{
+				result = create();
+				Add(result);
+			}
+			return result;
+		}
+		public U Find<U>() where U : T
+		{
+			return this.OfType<U>().FirstOrDefault();
+		}
+
+		public void Remove<U>() where U : T
+		{
+			foreach (var b in this.OfType<U>())
+			{
+				Remove(b);
+			}
+		}
+
+		#region IEnumerable<T> Members
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			IEnumerator<T> enumerator = _EnumeratorList?.GetEnumerator();
+			if (enumerator == null)
+			{
+				lock (_lock)
+				{
+					var behaviorsList = _Behaviors.ToList();
+					_EnumeratorList = behaviorsList;
+					enumerator = behaviorsList.GetEnumerator();
+				}
+			}
+			return enumerator;
+		}
+
+		#endregion
+
+		#region IEnumerable Members
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+
+		#endregion
+	}
+}