diff --git a/src/client/http/RequestManager.cpp b/src/client/http/RequestManager.cpp
index 99b132dc2..4bccdf63f 100644
--- a/src/client/http/RequestManager.cpp
+++ b/src/client/http/RequestManager.cpp
@@ -5,8 +5,8 @@
 #include <iostream>
 
 const int curl_multi_wait_timeout_ms = 100;
-const long curl_max_host_connections = 1;
-const long curl_max_concurrent_streams = 1;
+const long curl_max_host_connections = 2;
+const long curl_max_concurrent_streams = 50;
 
 namespace http
 {
diff --git a/src/gui/interface/AvatarButton.cpp b/src/gui/interface/AvatarButton.cpp
index 4ea60f37c..6409457f3 100644
--- a/src/gui/interface/AvatarButton.cpp
+++ b/src/gui/interface/AvatarButton.cpp
@@ -26,12 +26,10 @@ void AvatarButton::OnResponse(std::unique_ptr<VideoBuffer> Avatar)
 
 void AvatarButton::Tick(float dt)
 {
-	if(!avatar && !tried)
+	if (!avatar && !tried && name.size() > 0)
 	{
 		tried = true;
-		// TODO: Currently a very expensive-to-call endpoint; skips the cache server. If we call it too quickly, we get banned as
-		// an anti-DoS measure. This is why concurrent connections / connection multiplexing have been temporarily disabled.
-		RequestSetup(SCHEME SERVER "/Mini/GetAvatarPng.php?Username=" + name, Size.X, Size.Y);
+		RequestSetup(SCHEME STATICSERVER "/avatars/" + name + ".png", Size.X, Size.Y);
 		RequestStart();
 	}