diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index b722e908..51a30f0e 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -191,7 +191,10 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
 	listBoxPathFinderType.registerGraphicComponent(containerName,"listBoxPathFinderType");
 	listBoxPathFinderType.init(xoffset+450, aPos, 150);
 	listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRegular"));
-	listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRoutePlanner"));
+	if(config.getBool("EnableRoutePlannerPathfinder","false") == true) {
+		listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRoutePlanner"));
+	}
+
 	listBoxPathFinderType.setSelectedItemIndex(0);
 	listBoxPathFinderType.setEditable(false);
 
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index c0da27f4..f18fd337 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -307,7 +307,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
 	listBoxPathFinderType.registerGraphicComponent(containerName,"listBoxPathFinderType");
 	listBoxPathFinderType.init(xoffset+650, aPos, 150);
 	listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRegular"));
-	listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRoutePlanner"));
+	if(config.getBool("EnableRoutePlannerPathfinder","false") == true) {
+		listBoxPathFinderType.pushBackItem(lang.get("PathFinderTypeRoutePlanner"));
+	}
 	listBoxPathFinderType.setSelectedItemIndex(0);
 
 	// Advanced Options