diff --git a/src/linkgraph/refresh.cpp b/src/linkgraph/refresh.cpp
index 08808cc6f2..bd49343b1a 100644
--- a/src/linkgraph/refresh.cpp
+++ b/src/linkgraph/refresh.cpp
@@ -387,7 +387,9 @@ void LinkRefresher::RefreshLinks(const Order *cur, const Order *next, TimetableT
 				SetBit(flags, IN_AUTOREFIT);
 				LinkRefresher backup(*this);
 				for (CargoID c = 0; c != NUM_CARGO; ++c) {
-					if (CargoSpec::Get(c)->IsValid() && this->HandleRefit(c)) {
+					if (!CargoSpec::Get(c)->IsValid()) continue;
+					if (next->GetCargoLoadType(c) == OLFB_NO_LOAD) continue;
+					if (this->HandleRefit(c)) {
 						this->RefreshLinks(cur, next, travel, flags, num_hops);
 						*this = backup;
 					}