diff --git a/btrfs.c b/btrfs.c
index 1eb8b55a..90d852e0 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -393,11 +393,9 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
 static void
 print_key_value_internal(struct tcb *tcp, const char *name, uint64_t value)
 {
-	if (value) {
-		tprintf(", %s=%" PRIu64, name, value);
-		if (value == UINT64_MAX)
-			tprints_comment("UINT64_MAX");
-	}
+	tprintf(", %s=%" PRIu64, name, value);
+	if (value == UINT64_MAX)
+		tprints_comment("UINT64_MAX");
 }
 #define print_key_value(tcp, key, name)					\
 	print_key_value_internal((tcp), #name, (key)->name)
diff --git a/tests/btrfs.c b/tests/btrfs.c
index 64ac2acc..6435ed2a 100644
--- a/tests/btrfs.c
+++ b/tests/btrfs.c
@@ -848,18 +848,14 @@ btrfs_print_search_key(struct btrfs_ioctl_search_key *key)
 		printf(", max_objectid=");
 		btrfs_print_objectid(key->max_objectid);
 	}
-	if (key->min_offset)
-		printf(", min_offset=%" PRI__u64 "%s",
-		       key->min_offset, maybe_print_uint64max(key->min_offset));
-	if (key->max_offset)
-		printf(", max_offset=%" PRI__u64 "%s",
-		       key->max_offset, maybe_print_uint64max(key->max_offset));
-	if (key->min_transid)
-		printf(", min_transid=%" PRI__u64 "%s", key->min_transid,
-		       maybe_print_uint64max(key->min_transid));
-	if (key->max_transid)
-		printf(", max_transid=%" PRI__u64 "%s", key->max_transid,
-		       maybe_print_uint64max(key->max_transid));
+	printf(", min_offset=%" PRI__u64 "%s",
+	       key->min_offset, maybe_print_uint64max(key->min_offset));
+	printf(", max_offset=%" PRI__u64 "%s",
+	       key->max_offset, maybe_print_uint64max(key->max_offset));
+	printf(", min_transid=%" PRI__u64 "%s", key->min_transid,
+	       maybe_print_uint64max(key->min_transid));
+	printf(", max_transid=%" PRI__u64 "%s", key->max_transid,
+	       maybe_print_uint64max(key->max_transid));
 	printf(", min_type=");
 	btrfs_print_key_type(key->min_type);
 	printf(", max_type=");