diff --git a/src/structure.c b/src/structure.c
index 540d0d964..de907751f 100644
--- a/src/structure.c
+++ b/src/structure.c
@@ -3558,6 +3558,10 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool isMission)
 				{
 					doNextProduction(psStructure, (DROID_TEMPLATE *)pSubject);
 				}
+				else if (myResponsibility(psStructure->player))
+				{
+					cancelProduction(psStructure, ModeQueue);
+				}
 			}
 		}
 	}