diff --git a/src/viced/host.c b/src/viced/host.c
index c768188eea..b4b6b5cbb7 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -902,8 +902,8 @@ h_Enumerate_r(int (*proc) (), struct host *enumstart, char *param)
     if (hostCount == 0) {
 	return;
     }
-    if (!(held = h_Held_r(host)))
-	h_Hold_r(host);
+    if (enumstart && !(held = h_Held_r(enumstart)))
+	h_Hold_r(enumstart); 
     for (host = enumstart; host; host = next, held = nheld) {
 	held = (*proc) (host, held, param);
 	next = host->next;