diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 4688a87c..f1e109b2 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1534,7 +1534,7 @@ void make_block(BlockMakeData *data)
 	// Maximum amount of ground above the bottom of the central block
 	s16 maximum_ground_depth = maximum_groundlevel - node_min.Y;
 
-	#if 0
+	#if 1
 	/*
 		Special case for high air or water: Just fill with air and water.
 	*/
diff --git a/src/server.cpp b/src/server.cpp
index 100497b6..83412abf 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -688,7 +688,11 @@ 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)
-				if(server->m_emerge_queue.peerItemCount(peer_id) < 25)
+				s32 max_emerge = 25;
+				// Make it more responsive when needing to generate stuff
+				if(surely_not_found_on_disk)
+					max_emerge = 5;
+				if(server->m_emerge_queue.peerItemCount(peer_id) < max_emerge)
 				{
 					//infostream<<"Adding block to emerge queue"<<std::endl;