diff --git a/lib/util-disk.sh b/lib/util-disk.sh
index ec52cb4..74647c6 100644
--- a/lib/util-disk.sh
+++ b/lib/util-disk.sh
@@ -271,7 +271,7 @@ select_filesystem() {
         "btrfs") FILESYSTEM="mkfs.btrfs -f"
             CHK_NUM=16
             fs_opts="autodefrag compress=zlib compress=lzo compress=zstd compress=no compress-force=zlib compress-force=lzo compress-force=zstd discard \
-            noacl noatime nodatasum nospace_cache recovery skip_balance space_cache nossd ssd ssd_spread commit=120"
+            noacl noatime nodatasum nospace_cache recovery skip_balance space_cache=v2 nossd ssd ssd_spread commit=120"
             modprobe btrfs
             ;;
         "ext2") FILESYSTEM="mkfs.ext2 -q"
@@ -342,7 +342,7 @@ mount_opts() {
         sed -i 's/nossd - off/nossd - on/' /tmp/.fs_options
     else
         sed -i 's/compress=lzo - off/compress=lzo - on/' /tmp/.fs_options
-        sed -i 's/ space_cache - off/ space_cache - on/' /tmp/.fs_options
+        sed -i 's/ space_cache=v2 - off/ space_cache=v2 - on/' /tmp/.fs_options
         sed -i 's/commit=120 - off/commit=120 - on/' /tmp/.fs_options
         sed -i 's/ ssd - off/ ssd - on/' /tmp/.fs_options
 
@@ -1668,7 +1668,7 @@ mount_existing_subvols() {
     if [[ "$(cat /sys/block/${format_device}/queue/rotational)" == 1 ]]; then
         fs_opts="autodefrag,compress=zlib,noatime,nossd,commit=120"
     else
-        fs_opts="compress=lzo,noatime,space_cache,ssd,commit=120"
+        fs_opts="compress=lzo,noatime,space_cache=v2,ssd,commit=120"
     fi
     btrfs subvolume list /mnt | cut -d" " -f9 > /tmp/.subvols
     umount /mnt