diff --git a/scripts/HTN/Trees/Red/ConvoyUnit.xml b/scripts/HTN/Trees/Red/ConvoyUnit.xml
index 6d2a93fd4761e7606775b3875fcb37b2d0944230..fb5920f86108e540b8451b792acbae3d4754496e 100644
--- a/scripts/HTN/Trees/Red/ConvoyUnit.xml
+++ b/scripts/HTN/Trees/Red/ConvoyUnit.xml
@@ -192,7 +192,6 @@ if len(borg.redConvoysWaiting[state.getCurrentUnit().getName()])==0:
 
         # calculate how long on station they should be
         borg.redNumSetups[state.getCurrentUnitName()]=borg.params_redNumSetups
-        printMessage("SETTING TOS "+str(state.getCurrentUnitName()), True)
 
         SendEntityEvent(cmdName, "GoalTracker_ConvoySetup", [])
         borg.delay=1.0
@@ -284,7 +283,9 @@ if borg.redUnitStatus[state.getCurrentUnitName()]==setupNum:
     else:
         cmdName = state.getCurrentCommander().getAssignedName()
 
-    SendEntityEventDelay(cmdName, "GoalTracker_ConvoyPackUp", [], rn)
+    # only pack up if it's not an attack run or we still have destinations left to move to
+    if not borg.isAttackRun or len(borg.redConvoyDest[state.getCurrentUnit().getName()]) > 0:
+        SendEntityEventDelay(cmdName, "GoalTracker_ConvoyPackUp", [], rn)
 
     for member in state.getCurrentUnit().getMembers():
         if "RADAR" in member.getProfile().getName():