diff --git a/src/move.c b/src/move.c
index e6469cc4a..f1b2311f1 100644
--- a/src/move.c
+++ b/src/move.c
@@ -595,7 +595,7 @@ void 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;