@@ -407,11 +407,12 @@
       (if (and *server-run*
 	       (or (> (+ last-access server-timeout)
 		      (current-seconds))
 		   (and (eq? run-id 0)
 			(> (tasks:num-servers-non-zero-running tdb) 0))
-		   (> (db:get-count-tests-running *inmemdb* run-id) 0)
+		   (and (not (eq? run-id 0)) ;; only makes sense in non-zero run-id servers
+			(> (db:get-count-tests-running *inmemdb* run-id) 0))
 		   ))
 	  (begin
 	    (debug:print-info 0 "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
 	    ;;
 	    ;; Consider implementing some smarts here to re-insert the record or kill self is