diff --git a/scripts/functions.sh b/scripts/functions.sh
index 8c1228a..7aa2960 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -411,6 +411,9 @@ function disk_format() {
 				mkswap "$device" \
 					|| die "Could not format device '$device' ($id)"
 			fi
+
+			# Try to swapoff in case the system enabled swap automatically
+			swapoff "$device" &>/dev/null
 			;;
 		'ext4')
 			if [[ -v "arguments[label]" ]]; then