diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 84707215a..a1eaf5b18 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -549,7 +549,7 @@ leave_trail(ship * sh, region * from, region_list *route)
         a = a->next;
       }
 
-      if (a == NULL) {
+      if (a == NULL || a->type!=&at_shiptrail) {
         a = a_add(&(r->attribs), a_new(&at_shiptrail));
         td = (traveldir *)a->data.v;
         td->no = sh->no;