diff --git a/pio/name-firmware.py b/pio/name-firmware.py
index dfb9b7f85..1490ecc5c 100644
--- a/pio/name-firmware.py
+++ b/pio/name-firmware.py
@@ -28,6 +28,7 @@ def bin_map_copy(source, target, env):
     shutil.copy(str(target[0]), bin_file)
 
     # copy firmware.map to map/<variant>.map
-    shutil.copy("firmware.map", map_file)
+    if os.path.isfile("firmware.map"):
+        shutil.move("firmware.map", map_file)
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_map_copy])