diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs
index 7aaeeb2a58..1747226d34 100644
--- a/OpenRA.Mods.RA/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs
@@ -220,7 +220,11 @@ namespace OpenRA.Mods.RA
 
 		public bool CanBuild(ActorInfo actor)
 		{
-			return produceable.ContainsKey(actor) && produceable[actor].Buildable;
+			ProductionState ps;
+			if (!produceable.TryGetValue(actor, out ps))
+				return false;
+
+			return ps.Buildable || (self.World.AllowDevCommands && developerMode.AllTech);
 		}
 
 		public virtual void Tick(Actor self)