diff --git a/production/mempool-build-all b/production/mempool-build-all
index e6e3b1b24..7dd298670 100755
--- a/production/mempool-build-all
+++ b/production/mempool-build-all
@@ -16,7 +16,8 @@ if [ -f "${LOCKFILE}" ];then
     exit 1
 fi
 
-trap 'rm -f "${LOCKFILE}"; exit $?' INT TERM EXIT
+trap "rv=\$?; rm -rf "${LOCKFILE}"; exit \$rv" INT TERM EXIT
+
 touch "${LOCKFILE}"
 
 echo "Upgrading mempool to ${REF}" | wall