Index: binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Commands.js
+++ binaries/data/mods/public/simulation/helpers/Commands.js
@@ -1413,6 +1413,7 @@
 			return [];
 
 		RemoveFromFormation(ents);
+		cmpUnitAI.SetLastFormationTemplate("formations/null");
 
 		return [ cmpUnitAI ];
 	}
@@ -1438,7 +1439,10 @@
 		else
 		{
 			if (nullFormation)
+			{
+				RemoveFromFormation([ent]);
 				cmpUnitAI.SetLastFormationTemplate("formations/null");
+			}
 			nonformedUnitAIs.push(cmpUnitAI);
 		}
 	}