diff --git a/src/knot/server/server.c b/src/knot/server/server.c
index 31097f32ce173f47d256e33590022a3bc7bc4299..4701e228a5d79e5c6129d779423733c25a5e6cdf 100644
--- a/src/knot/server/server.c
+++ b/src/knot/server/server.c
@@ -545,7 +545,7 @@ int server_start(server_t *server)
 	dbg_server("server: starting server instance\n");
 
 	/* Start XFR handler. */
-//	xfr_start(server->xfr_h);
+	xfr_start(server->xfr_h);
 
 	/* Lock configuration. */
 	rcu_read_lock();
@@ -579,7 +579,7 @@ int server_start(server_t *server)
 int server_wait(server_t *server)
 {
 	/* Join threading unit. */
-//	xfr_join(server->xfr_h); TODO
+	xfr_join(server->xfr_h);
 	
 	/* Lock RCU. */
 	rcu_read_lock();