diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 3d0aa83e8a..83bc880e5c 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -1334,6 +1334,14 @@ var UnitFsmSpec = {
 			// Sanity-checking
 			if (this.IsAnimal())
 				error("Animal got moved into INDIVIDUAL.* state");
+
+			// an entity in individual state shouldn't belong to a formation
+			if (this.IsFormationMember())
+			{
+				var cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
+				if (cmpFormation)
+					cmpFormation.RemoveMembers([this.entity]);
+			}
 		},
 
 		"Attacked": function(msg) {