diff --git a/runbot_merge/scripts/git-fw b/runbot_merge/scripts/git-fw
index d9c03b850..99fc4df71 100755
--- a/runbot_merge/scripts/git-fw
+++ b/runbot_merge/scripts/git-fw
@@ -147,6 +147,7 @@ def redo(pr: str) -> int:
         exit(r.returncode)
     print(".")
     commits = r.stdout.splitlines(keepends=False)
+    GIT_DIR.joinpath("FW_CMAP").unlink(missing_ok=True)
     if cm:
         # remap commits to forward port to those which got merged
         commits = [cm[c] for c in commits]