diff --git a/kdc/misc.c b/kdc/misc.c
index 5bd3e785d..62b1c356b 100644
--- a/kdc/misc.c
+++ b/kdc/misc.c
@@ -54,10 +54,12 @@ _kdc_db_fetch(krb5_context context,
     *h = NULL;
 
     if (kvno_ptr != NULL) {
-	if (*kvno_ptr != 0)
+	if (*kvno_ptr != 0) {
+	    kvno = *kvno_ptr;
 	    flags |= HDB_F_KVNO_SPECIFIED;
-	else
+	} else {
 	    flags |= HDB_F_ALL_KVNOS;
+	}
     }
 
     ent = calloc(1, sizeof (*ent));