diff --git a/src/quickfix.c b/src/quickfix.c
index 8537a7c..8fef225 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3654,7 +3654,11 @@
 	}
     }
 
-    qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
+    if (qi->qf_lists[qi->qf_curlist].qf_index == 0)
+	/* empty list or no valid entry */
+	qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE;
+    else
+	qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
     qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start;
     qi->qf_lists[qi->qf_curlist].qf_index = 1;