diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 388e7f66ea..8f5c60abf8 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1769,7 +1769,6 @@ CommandCost CmdModifyOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			if (data == OCV_FREE_PLATFORMS && v->type != VEH_TRAIN) return CMD_ERROR;
 			if (data == OCV_SLOT_OCCUPANCY && v->type != VEH_TRAIN) return CMD_ERROR;
 			if (data == OCV_TRAIN_IN_SLOT && v->type != VEH_TRAIN) return CMD_ERROR;
-			if (data == OCV_COUNTER_VALUE && v->type != VEH_TRAIN) return CMD_ERROR;
 			if (data >= OCV_END) return CMD_ERROR;
 			break;
 
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 117582273a..05cd7d771c 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -2477,7 +2477,7 @@ public:
 				DropDownList list;
 				for (uint i = 0; i < lengthof(_order_conditional_variable); i++) {
 					if (this->vehicle->type != VEH_TRAIN && (_order_conditional_variable[i] == OCV_TRAIN_IN_SLOT || _order_conditional_variable[i] == OCV_SLOT_OCCUPANCY ||
-							_order_conditional_variable[i] == OCV_FREE_PLATFORMS || _order_conditional_variable[i] == OCV_COUNTER_VALUE)) {
+							_order_conditional_variable[i] == OCV_FREE_PLATFORMS)) {
 						continue;
 					}
 					if (ocv != _order_conditional_variable[i]) {
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index efd057542b..43b9edc066 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -465,6 +465,8 @@ DropDownList BaseVehicleListWindow::BuildActionDropdownList(bool show_autoreplac
 	}
 	if (this->vli.vtype == VEH_TRAIN && _settings_client.gui.show_adv_tracerestrict_features) {
 		list.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_SLOT_MANAGE, ADI_TRACERESTRICT_SLOT_MGMT, false));
+	}
+	if (_settings_client.gui.show_adv_tracerestrict_features) {
 		list.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_COUNTER_MANAGE, ADI_TRACERESTRICT_COUNTER_MGMT, false));
 	}
 	if (change_order_str != 0) {