diff --git a/src/Factory/HTTPClientFactory.php b/src/Factory/HTTPClientFactory.php
index 7da2718d7f..7f7d5e5d73 100644
--- a/src/Factory/HTTPClientFactory.php
+++ b/src/Factory/HTTPClientFactory.php
@@ -101,6 +101,9 @@ class HTTPClientFactory extends BaseFactory
 		$resolver->setRequestTimeout(10);
 		// if the file is too large then exit
 		$resolver->setMaxResponseDataSize(1000000);
+		// Designate a temporary file that will store cookies during the session.
+		// Some websites test the browser for cookie support, so this enhances results.
+		$resolver->setCookieJar(get_temppath() . '/url_resolver.cookie', true);
 
 		return new HTTPClient($logger, $this->profiler, $guzzle, $resolver);
 	}
diff --git a/src/Network/HTTPClient.php b/src/Network/HTTPClient.php
index 72f11fa3ed..f4293cd086 100644
--- a/src/Network/HTTPClient.php
+++ b/src/Network/HTTPClient.php
@@ -221,10 +221,6 @@ class HTTPClient implements IHTTPClient
 
 		$url = trim($url, "'");
 
-		// Designate a temporary file that will store cookies during the session.
-		// Some websites test the browser for cookie support, so this enhances results.
-		$this->resolver->setCookieJar(tempnam(get_temppath() , 'url_resolver-'));
-
 		$urlResult = $this->resolver->resolveURL($url);
 
 		if ($urlResult->didErrorOccur()) {