diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
index 7b21329f7a7..0ae8290b75f 100644
--- a/tools/tools/nanobsd/legacy.sh
+++ b/tools/tools/nanobsd/legacy.sh
@@ -197,7 +197,7 @@ create_diskimage ( ) (
 	fi
 	mdconfig -d -u $MD
 
-	trap - 1 2 15
+	trap - 1 2 15 EXIT
 
 	) > ${NANO_LOG}/_.di 2>&1
 )