diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 98d931e153..6aa7b1798f 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -2919,8 +2919,8 @@ void CheckOrders(const Vehicle *v)
 			}
 		}
 
-		/* Check if the last and the first order are the same */
-		if (v->GetNumOrders() > 1) {
+		/* Check if the last and the first order are the same, and the first order is a go to order */
+		if (v->GetNumOrders() > 1 && v->orders->GetFirstOrder()->IsGotoOrder()) {
 			const Order *last = v->GetLastOrder();
 
 			if (v->orders->GetFirstOrder()->Equals(*last)) {