diff --git a/OpenRA.Mods.Common/Activities/UnloadCargo.cs b/OpenRA.Mods.Common/Activities/UnloadCargo.cs
index b3ef062501..4698ae632d 100644
--- a/OpenRA.Mods.Common/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.Common/Activities/UnloadCargo.cs
@@ -23,14 +23,14 @@ namespace OpenRA.Mods.Common.Activities
 	{
 		readonly Actor self;
 		readonly Cargo cargo;
-		readonly Cloak cloak;
+		readonly Cloak[] cloaks;
 		readonly bool unloadAll;
 
 		public UnloadCargo(Actor self, bool unloadAll)
 		{
 			this.self = self;
 			cargo = self.Trait<Cargo>();
-			cloak = self.TraitOrDefault<Cloak>();
+			cloaks = self.TraitsImplementing<Cloak>().ToArray();
 			this.unloadAll = unloadAll;
 		}
 
@@ -60,8 +60,9 @@ namespace OpenRA.Mods.Common.Activities
 			if (IsCanceled || cargo.IsEmpty(self))
 				return NextActivity;
 
-			if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Unload))
-				cloak.Uncloak();
+			foreach (var cloak in cloaks)
+				if (cloak.Info.UncloakOn.HasFlag(UncloakType.Unload))
+					cloak.Uncloak();
 
 			var actor = cargo.Peek(self);
 			var spawn = self.CenterPosition;