diff --git a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
index 02bae43bfd..a6075c4045 100644
--- a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
+++ b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Widgets
 		{
 			// Queue-per-structure
 			var perqueue = world.Selection.Actors.FirstOrDefault(
-				a => a.World.LocalPlayer == a.Owner && a.HasTrait<ProductionQueue>());
+				a => a.IsInWorld && a.World.LocalPlayer == a.Owner && a.HasTrait<ProductionQueue>());
 			
 			if (perqueue != null)
 			{
@@ -42,7 +42,8 @@ namespace OpenRA.Mods.RA.Widgets
 			}
 			
 			// Queue-per-player
-			var types = world.Selection.Actors.SelectMany(a => a.TraitsImplementing<Production>())
+			var types = world.Selection.Actors.Where(a => a.IsInWorld)
+											  .SelectMany(a => a.TraitsImplementing<Production>())
 											  .SelectMany(t => t.Info.Produces)
 											  .Distinct();