diff --git a/CHANGES b/CHANGES
index 29262e27e..09b7482cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel (23 April 2004)
+- Gisle Vanem found and fixed a memory leak when doing (failing) Windows
+  threaded name resolves.
+
 - I also added test case 163 just to make sure -F "var=<file" works fine and
   can pass on characters such as newlines, carriage-return and tabs.
 
diff --git a/lib/hostip.c b/lib/hostip.c
index e0bfe5b17..32bb03de3 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -1531,12 +1531,15 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
     }
     else
       rc = CURLE_OPERATION_TIMEDOUT;
+  }
 
-    destroy_thread_data(&conn->async);
+  destroy_thread_data(&conn->async);
+
+  if (CURLE_OK != rc)
     /* close the connection, since we can't return failure here without
        cleaning up this connection properly */
     Curl_disconnect(conn);
-  }
+
   return (rc);
 }