diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp
index 6d3365ee..04cd9922 100644
--- a/source/glest_game/type_instances/unit.cpp
+++ b/source/glest_game/type_instances/unit.cpp
@@ -1831,6 +1831,10 @@ bool Unit::update() {
 		}
 	}
 
+	if(return_value) {
+		changedActiveCommand = false;
+	}
+
 	return return_value;
 }