diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index ace15502..680fab2c 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -400,6 +400,8 @@ bool LoadINISettings()
 	ReadIniIfExists("CustomPipesValues", "PostFXIntensity", &CPostFX::Intensity);
 #endif
 #ifdef EXTENDED_PIPELINES
+	ReadIniIfExists("CustomPipesValues", "VehiclePipeline", &CustomPipes::VehiclePipeSwitch);
+	ReadIniIfExists("CustomPipesValues", "WorldPipeline", &CustomPipes::WorldPipeSwitch);
 	ReadIniIfExists("CustomPipesValues", "NeoVehicleShininess", &CustomPipes::VehicleShininess);
 	ReadIniIfExists("CustomPipesValues", "NeoVehicleSpecularity", &CustomPipes::VehicleSpecularity);
 	ReadIniIfExists("CustomPipesValues", "RimlightMult", &CustomPipes::RimlightMult);
@@ -488,6 +490,8 @@ void SaveINISettings()
 	StoreIni("CustomPipesValues", "PostFXIntensity", CPostFX::Intensity);
 #endif
 #ifdef EXTENDED_PIPELINES
+	StoreIni("CustomPipesValues", "VehiclePipeline", CustomPipes::VehiclePipeSwitch);
+	StoreIni("CustomPipesValues", "WorldPipeline", CustomPipes::WorldPipeSwitch);
 	StoreIni("CustomPipesValues", "NeoVehicleShininess", CustomPipes::VehicleShininess);
 	StoreIni("CustomPipesValues", "NeoVehicleSpecularity", CustomPipes::VehicleSpecularity);
 	StoreIni("CustomPipesValues", "RimlightMult", CustomPipes::RimlightMult);
diff --git a/src/extras/custompipes.cpp b/src/extras/custompipes.cpp
index 390ec475..a874343d 100644
--- a/src/extras/custompipes.cpp
+++ b/src/extras/custompipes.cpp
@@ -370,7 +370,7 @@ AttachVehiclePipe(rw::Clump *clump)
  * Neo World pipe
  */
 
-int32 WorldPipeSwitch = 0;
+int32 WorldPipeSwitch = WORLDPIPE_PS2;
 bool LightmapEnable;
 float LightmapMult = 1.0f;
 InterpolatedFloat WorldLightmapBlend(1.0f);