diff --git a/common/fsfeatures.c b/common/fsfeatures.c
index 2c43eae5..02d13f60 100644
--- a/common/fsfeatures.c
+++ b/common/fsfeatures.c
@@ -691,8 +691,14 @@ int btrfs_tree_search_ioctl(int fd, struct btrfs_tree_search_args *sa)
 {
 	/* On first use check the supported status and save it. */
 	if (!tree_search_v2_initialized) {
+#if 0
+		/*
+		 * Keep using v1 until v2 is fully tested, in some cases it
+		 * does not return properly formatted results in the buffer.
+		 */
 		if (btrfs_tree_search2_ioctl_supported(fd) == 1)
 			tree_search_v2_supported = true;
+#endif
 		tree_search_v2_initialized = true;
 	}
 	sa->use_v2 = tree_search_v2_supported;