diff --git a/src/main/java/com/faforever/api/map/MapService.java b/src/main/java/com/faforever/api/map/MapService.java
index 890136cf3..ed2ea9974 100644
--- a/src/main/java/com/faforever/api/map/MapService.java
+++ b/src/main/java/com/faforever/api/map/MapService.java
@@ -95,9 +95,10 @@ public MapNameValidationResponse requestMapNameValidation(String mapName) {
     Integer nextVersion = mapRepository.findOneByDisplayName(mapNameBuilder.getDisplayName())
       .map(map -> map.getVersions().stream()
         .mapToInt(MapVersion::getVersion)
+        .map(i -> i + 1)
         .max()
         .orElse(1))
-      .orElse(2);
+      .orElse(1);
 
     return MapNameValidationResponse.builder()
       .displayName(mapNameBuilder.getDisplayName())