diff --git a/src/ckdb.h b/src/ckdb.h
index fc1403c9..a8e1cacb 100644
--- a/src/ckdb.h
+++ b/src/ckdb.h
@@ -52,7 +52,7 @@
 
 #define DB_VLOCK "1"
 #define DB_VERSION "0.9.6"
-#define CKDB_VERSION DB_VERSION"-0.804"
+#define CKDB_VERSION DB_VERSION"-0.810"
 
 #define WHERE_FFL " - from %s %s() line %d"
 #define WHERE_FFL_HERE __FILE__, __func__, __LINE__
diff --git a/src/ckdb_data.c b/src/ckdb_data.c
index 977547de..f8673028 100644
--- a/src/ckdb_data.c
+++ b/src/ckdb_data.c
@@ -1177,8 +1177,8 @@ K_ITEM *find_any_payaddress(char *payaddress)
 	K_ITEM *item;
 
 	item = first_in_ktree(paymentaddresses_root, ctx);
-	DATA_PAYMENTADDRESSES_NULL(pa, item);
 	while (item) {
+		DATA_PAYMENTADDRESSES(pa, item);
 		if (strcmp(pa->payaddress, payaddress) == 0)
 			return item;
 		item = next_in_ktree(ctx);