diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index a07016f35..4202639f3 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -298,7 +298,12 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
                 mount_option_no_subvol = get_mount_options("btrfs_swap", mount_options, partition)
             else:
                 mount_option_no_subvol = get_mount_options(fstype, mount_options, partition)
-            mount_option = f"subvol={s['subvolume']},{mount_option_no_subvol}"
+
+            # Only add subvol= argument if we are not mounting the entire filesystem
+            if s['subvolume']:
+                mount_option = f"subvol={s['subvolume']},{mount_option_no_subvol}"
+            else:
+                mount_option = mount_option_no_subvol
             subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
             mount_options_list.append({"mountpoint": s['mountPoint'], "option_string": mount_option_no_subvol})
             if libcalamares.utils.mount(device,