diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
index 0a3f1a11c3..536126f37f 100755
--- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
@@ -81,6 +81,9 @@ namespace OpenRA.Mods.RA.Widgets
 				.Where(p => p.Actor.Owner == world.LocalPlayer)
 				.Select(p => p.Trait);
 			
+			if (CurrentQueue != null && CurrentQueue.self.Destroyed)
+				CurrentQueue = null;
+			
 			foreach (var queue in queues)
 			{
 				if (queue.AllItems().Count() > 0)