diff --git a/src/gaemstone.Client/Systems/EntityInspector.cs b/src/gaemstone.Client/Systems/EntityInspector.cs
index 914c000..9bf612e 100644
--- a/src/gaemstone.Client/Systems/EntityInspector.cs
+++ b/src/gaemstone.Client/Systems/EntityInspector.cs
@@ -108,7 +108,7 @@ public partial class EntityInspector
 		                ref isOpen, ImGuiWindowFlags.NoScrollbar)) {
 			ImGui.PushFont(ImGui.GetIO().Fonts.Fonts[0]);
 
-			var selected = window.GetTargets<Selected>().FirstOrDefault();
+			var selected = window.GetTargets<Selected>().FirstOrDefault().AliveOrNull();
 			ActionBarAndPath(window, history, selected);
 
 			ImGui.BeginTable("Views", 2, ImGuiTableFlags.Resizable);
diff --git a/src/gaemstone.ECS b/src/gaemstone.ECS
index 42f843e..9eade0a 160000
--- a/src/gaemstone.ECS
+++ b/src/gaemstone.ECS
@@ -1 +1 @@
-Subproject commit 42f843e690ec957ff1bb64c6b61e5e80ce13a7e0
+Subproject commit 9eade0adb1200223dffcb2077ecbc992569f4080