diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index 4aae5f09f..b0b50d1e2 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -23,7 +23,6 @@ _clear_fs_values() {
     _SKIP_FILESYSTEM=""
     _DOMKFS=""
     _LABEL_NAME=""
-    _FSTYPE=""
     _FS_OPTIONS=""
     _BTRFS_DEVS=""
     _BTRFS_LEVEL=""
@@ -80,6 +79,7 @@ _enter_mountpoint() {
                 _FS_OPTIONS="-U clear --size ${_SWAPFILE_SIZE}M --file"
             done
             if ! [[ "${_FSTYPE}" == "swap" ]]; then
+                _SKIP_FILESYSTEM=1
                 _DOMKFS=1
                 _LABEL_NAME="SWAP"
             fi
@@ -257,7 +257,7 @@ _mountpoints() {
                     _clear_fs_values
                     _check_btrfs_filesystem_creation
                     ! [[ "${_DEV}" == "> NONE" || "${_DEV}" == "> FILE" ]] && _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}" 2>"${_NO_LOG}")"
-                    if [[ -z "${_SWAP_DONE}" && "${_FSTYPE}" == "swap" ]] || [[ "${_DEV}" == "> NONE" ]]; then
+                    if [[ -z "${_SWAP_DONE}" && "${_FSTYPE}" == "swap" ]] || [[ "${_DEV}" == "> NONE" ]] || [[ "${_DEV}" == "> NONE" ]]; then
                         _SKIP_FILESYSTEM=1
                     fi
                     # _CREATE_MOUNTPOINTS switch for create filesystem and only mounting filesystem