diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index bc112fc..e1a4604 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -900,7 +900,11 @@ else
 	BUILDDIR="$KERNEL_SRCDIR"
 fi
 
-[[ "$SKIPCLEANUP" -eq 0 ]] && trap cleanup EXIT INT TERM HUP
+if [[ "$SKIPCLEANUP" -eq 0 ]]; then
+	trap cleanup EXIT INT TERM HUP
+else
+	trap remove_patches EXIT INT TERM HUP
+fi
 
 # Don't check external file.
 # shellcheck disable=SC1090