diff --git a/evdns.c b/evdns.c
index b1e0644e..d76be335 100644
--- a/evdns.c
+++ b/evdns.c
@@ -2954,6 +2954,8 @@ evdns_shutdown(int fail_requests)
 		if (server->socket >= 0)
 			CLOSE_SOCKET(server->socket);
 		(void) event_del(&server->event);
+		if (server->state == 0)
+                        (void) event_del(&server->timeout_event);
 		free(server);
 		if (server_next == server_head)
 			break;