diff --git a/order.h b/order.h
index fd7f96e7ef..43b8e9c71b 100644
--- a/order.h
+++ b/order.h
@@ -191,6 +191,8 @@ static inline Order UnpackOrder(uint32 packed)
 	order.dest    = GB(packed, 16, 16);
 	order.next    = NULL;
 	order.index   = 0; // avoid compiler warning
+	order.refit_cargo   = CT_INVALID;
+	order.refit_subtype = 0;
 	return order;
 }
 
diff --git a/order_cmd.c b/order_cmd.c
index fad343b1fd..b87fb68794 100644
--- a/order_cmd.c
+++ b/order_cmd.c
@@ -57,6 +57,9 @@ Order UnpackOldOrder(uint16 packed)
 		order.flags = 0;
 	}
 
+	order.refit_cargo   = CT_INVALID;
+	order.refit_subtype = 0;
+
 	return order;
 }
 
@@ -73,6 +76,8 @@ static Order UnpackVersion4Order(uint16 packed)
 	order.dest  = GB(packed, 8, 8);
 	order.next  = NULL;
 	order.index = 0; // avoid compiler warning
+	order.refit_cargo   = CT_INVALID;
+	order.refit_subtype = 0;
 	return order;
 }
 
diff --git a/order_gui.c b/order_gui.c
index 66a30ba7e6..bce2591219 100644
--- a/order_gui.c
+++ b/order_gui.c
@@ -215,6 +215,8 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
 	Order order;
 	order.next  = NULL;
 	order.index = 0;
+	order.refit_cargo   = CT_INVALID;
+	order.refit_subtype = 0;
 
 	// check depot first
 	if (_patches.gotodepot) {