--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -2367,6 +2367,7 @@
   DNSSDMaster = NULL;
 
 #  else /* HAVE_AVAHI */
+  avahi_threaded_poll_stop(DNSSDMaster);
   avahi_client_free(DNSSDClient);
   DNSSDClient = NULL;