diff --git a/app/routers/maps.py b/app/routers/maps.py
index 543a5fc..613ea29 100644
--- a/app/routers/maps.py
+++ b/app/routers/maps.py
@@ -62,10 +62,11 @@ async def upload_map(map_in: MapIn):
     if existing_map:
         return MapOut(**existing_map[0])
     else:
-        uploaded_filename = f"{filename}.gck"
+        uploaded_filename = filename
         i = 0
         while os.path.exists(f"{config['upload_path']}{uploaded_filename}"):
-            uploaded_filename = f"{filename}-{i}.gck"
+            file_wo_ext = ".".join(filename.split('.')[0:-1])
+            uploaded_filename = f"{file_wo_ext}-{i}.gck"
             i += 1
         with open(f"{config['upload_path']}{uploaded_filename}", "wb") as fp:
             fp.write(map_bytes)