--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -116,17 +116,11 @@ ngx_resolver_create(ngx_peer_addr_t *add
     r->addr_rbtree.sentinel = &r->addr_sentinel;
     r->addr_rbtree.insert = ngx_rbtree_insert_value;
 
-    r->name_resend_queue.prev = &r->name_resend_queue;
-    r->name_resend_queue.next = &r->name_resend_queue;
-
-    r->addr_resend_queue.prev = &r->addr_resend_queue;
-    r->addr_resend_queue.next = &r->addr_resend_queue;
-
-    r->name_expire_queue.prev = &r->name_expire_queue;
-    r->name_expire_queue.next = &r->name_expire_queue;
-
-    r->addr_expire_queue.prev = &r->addr_expire_queue;
-    r->addr_expire_queue.next = &r->addr_expire_queue;
+    ngx_queue_init(&r->name_resend_queue);
+    ngx_queue_init(&r->addr_resend_queue);
+
+    ngx_queue_init(&r->name_expire_queue);
+    ngx_queue_init(&r->addr_expire_queue);
 
     r->event->handler = ngx_resolver_resend_handler;
     r->event->data = r;