diff --git a/dehydrated b/dehydrated
index a15fb048..49e45453 100755
--- a/dehydrated
+++ b/dehydrated
@@ -565,7 +565,7 @@ init_system() {
     [[ -w "${LOCKDIR}" ]] || _exiterr "Directory ${LOCKDIR} for LOCKFILE ${LOCKFILE} is not writable, aborting."
     ( set -C; date > "${LOCKFILE}" ) 2>/dev/null || _exiterr "Lock file '${LOCKFILE}' present, aborting."
     remove_lock() { rm -f "${LOCKFILE}"; }
-    trap 'remove_lock' EXIT
+    trap 'remove_lock' EXIT TERM
   fi
 
   # Get CA URLs