diff --git a/encompass-cs/ComponentManager.cs b/encompass-cs/ComponentManager.cs
index 95d3423..4c7cc60 100644
--- a/encompass-cs/ComponentManager.cs
+++ b/encompass-cs/ComponentManager.cs
@@ -218,11 +218,12 @@ namespace Encompass
         {
             foreach (var componentID in componentsMarkedForRemoval)
             {
-                if (componentIDsMarkedForWrite.Contains(componentID) && !IDToComponent.ContainsKey(componentID))
+                if (componentIDsMarkedForWrite.Contains(componentID))
                 {
                     componentIDsMarkedForWrite.Remove(componentID);
                 }
-                else
+                
+                if (IDToComponent.ContainsKey(componentID))
                 {
                     Remove(componentID);
                 }