diff --git a/src/tbtr_template_vehicle.cpp b/src/tbtr_template_vehicle.cpp
index 096ee0c290..c0ec2f2ab3 100644
--- a/src/tbtr_template_vehicle.cpp
+++ b/src/tbtr_template_vehicle.cpp
@@ -68,8 +68,10 @@ TemplateVehicle::TemplateVehicle(VehicleType ty, EngineID eid, byte subtypeflag,
 	this->type = ty;
 	this->engine_type = eid;
 
-	this->reuse_depot_vehicles = true;
-	this->keep_remaining_vehicles = true;
+	this->reuse_depot_vehicles = false;
+	this->keep_remaining_vehicles = false;
+	this->refit_as_template = true;
+	this->replace_old_only = false;
 
 	this->first = this;
 	this->next = 0x0;
diff --git a/src/tbtr_template_vehicle.h b/src/tbtr_template_vehicle.h
index a954411053..a5d4e2192d 100644
--- a/src/tbtr_template_vehicle.h
+++ b/src/tbtr_template_vehicle.h
@@ -119,7 +119,6 @@ public:
 	SpriteID colourmap;                              ///< NOSAVE: cached colour mapping
 
 	TemplateVehicle(VehicleType type = VEH_INVALID, EngineID e = INVALID_ENGINE, byte B = 0, Owner = _local_company);
-	TemplateVehicle(EngineID, RailVehicleInfo*);
 
 	TemplateVehicle(EngineID eid)
 	{
@@ -127,7 +126,7 @@ public:
 		previous = nullptr;
 		first = this;
 		engine_type = eid;
-		this->reuse_depot_vehicles = true;
+		this->reuse_depot_vehicles = false;
 		this->keep_remaining_vehicles = false;
 		this->refit_as_template = true;
 		this->replace_old_only = false;
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 82d5d669da..f8f79f30c0 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -1154,7 +1154,7 @@ CommandCost CmdReplaceTemplateVehicle(TileIndex tile, DoCommandFlag flags, uint3
 		VehicleID old_ID = INVALID_VEHICLE;
 
 		bool restore_flags = false;
-		bool reuse_depot_vehicles = true;
+		bool reuse_depot_vehicles = false;
 		bool keep_remaining_vehicles = false;
 		bool refit_as_template = true;
 		bool replace_old_only = false;