diff --git a/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataController.java b/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataController.java
index c779ee81..01e9595f 100755
--- a/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataController.java
+++ b/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataController.java
@@ -51,22 +51,24 @@ private static Set<Country> toCountrySet(@RequestParam(required = false) List<St
     @GetMapping(value = "/substations", produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiOperation(value = "Get substations geographical data", response = List.class)
     @ApiResponses(value = {@ApiResponse(code = 200, message = "Substations geographical data")})
-    public ResponseEntity<List<SubstationGeoData>> getSubstations(@RequestParam UUID networkUuid,
+    public ResponseEntity<List<SubstationGeoData>> getSubstations(@RequestParam(required = false) UUID networkUuid,
                                                                   @RequestParam(required = false) List<String> countries) {
         Set<Country> countrySet = toCountrySet(countries);
         Network network = networkStoreService.getNetwork(networkUuid);
-        List<SubstationGeoData> substations = geoDataService.getSubstations(network, countrySet);
+        List<SubstationGeoData> substations = networkUuid != null ? geoDataService.getSubstations(network, countrySet)
+                                                                  : geoDataService.getSubstations();
         return ResponseEntity.ok().body(substations);
     }
 
     @GetMapping(value = "/lines", produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiOperation(value = "Get lines geographical data", response = List.class)
     @ApiResponses(value = {@ApiResponse(code = 200, message = "Lines geographical data")})
-    public ResponseEntity<List<LineGeoData>> getLines(@RequestParam UUID networkUuid,
+    public ResponseEntity<List<LineGeoData>> getLines(@RequestParam(required = false) UUID networkUuid,
                                                       @RequestParam(required = false) List<String> countries) {
         Set<Country> countrySet = toCountrySet(countries);
         Network network = networkStoreService.getNetwork(networkUuid);
-        List<LineGeoData> lines = geoDataService.getLines(network, countrySet);
+        List<LineGeoData> lines = networkUuid != null ? geoDataService.getLines(network, countrySet)
+                                                      : geoDataService.getLines();
         return ResponseEntity.ok().body(lines);
     }
 
diff --git a/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataService.java b/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataService.java
index 418447e5..ffa497e5 100755
--- a/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataService.java
+++ b/geo-data-server/src/main/java/com/powsybl/geodata/server/GeoDataService.java
@@ -60,6 +60,12 @@ private Map<String, SubstationGeoData> readSubstationGeoDataFromDb(Set<Country>
         return substationsGeoDataDB;
     }
 
+    List<SubstationGeoData> getSubstations() {
+        LOGGER.info("Loading all substations geo data");
+
+        return new ArrayList<>(readSubstationGeoDataFromDb(null).values());
+    }
+
     List<SubstationGeoData> getSubstations(Network network, Set<Country> countries) {
         LOGGER.info("Loading substations geo data for countries {} of network '{}'", countries, network.getId());
 
@@ -236,6 +242,12 @@ void saveLines(List<LineGeoData> linesGeoData) {
         lineRepository.saveAll(linesEntities);
     }
 
+    List<LineGeoData> getLines() {
+        LOGGER.info("Loading all lines geo data");
+
+        return new ArrayList<>(lineCustomRepository.getLines().values());
+    }
+
     List<LineGeoData> getLines(Network network, Set<Country> countries) {
         LOGGER.info("Loading lines geo data for countries {} of network '{}'", countries, network.getId());