diff --git a/src/server.cpp b/src/server.cpp
index 02734bbc0..a0549d424 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -684,10 +684,10 @@ void RemoteClient::GetNextBlocks(Server *server, float dtime,
 				//if(server->m_emerge_queue.peerItemCount(peer_id) < 1)
 				// Allow two blocks in queue per client
 				//if(server->m_emerge_queue.peerItemCount(peer_id) < 2)
-				u32 max_emerge = 25;
+				u32 max_emerge = 5;
 				// Make it more responsive when needing to generate stuff
 				if(surely_not_found_on_disk)
-					max_emerge = 5;
+					max_emerge = 2;
 				if(server->m_emerge_queue.peerItemCount(peer_id) < max_emerge)
 				{
 					//infostream<<"Adding block to emerge queue"<<std::endl;