diff --git a/encompass-cs/Collections/TypedMessageStore.cs b/encompass-cs/Collections/TypedMessageStore.cs
index 1a2c60c..f47e2da 100644
--- a/encompass-cs/Collections/TypedMessageStore.cs
+++ b/encompass-cs/Collections/TypedMessageStore.cs
@@ -113,6 +113,10 @@ namespace Encompass
 
         public override void Clear()
         {
+            foreach (var index in _indices)
+            {
+                _idManager.Free(index);
+            }
             _indices.Clear();
             foreach (var set in _entityToIndices.Values)
             {