diff --git a/src/main.c b/src/main.c
index 2d3e6d5d..d68f8b64 100644
--- a/src/main.c
+++ b/src/main.c
@@ -332,6 +332,11 @@ int main(int argc, char *argv[]) {
 	}
     }
 
+    if(config.use_mdns) {
+	fprintf(stderr,"Starting rendezvous daemon\n");
+	rend_init(&config.rend_pid,config.servername, config.port);
+    }
+
     DPRINTF(ERR_DEBUG,"Initializing database\n");
 
     /* Initialize the database before starting */
@@ -371,11 +376,6 @@ int main(int argc, char *argv[]) {
     ws_registerhandler(server,"^/logout$",daap_handler,NULL,0);
     ws_registerhandler(server,"^/databases/.*",daap_handler,NULL,0);
 
-    if(config.use_mdns) {
-	fprintf(stderr,"Starting rendezvous daemon\n");
-	rend_init(&config.rend_pid,config.servername, config.port);
-    }
-
     config.stop=0;
 
     while(!config.stop)