diff --git a/src/Core/Entity.bf b/src/Core/Entity.bf
index 55a8b7f..e5a82ca 100644
--- a/src/Core/Entity.bf
+++ b/src/Core/Entity.bf
@@ -37,6 +37,7 @@ namespace Strawberry
 			{
 				c.End();
 				c.[Friend]IsAwake = false;
+				Scene.[Friend]UntrackComponent(c);
 			}
 			Scene = null;
 			IsAwake = false;