diff --git a/streamer/src/nonblocking/quic.rs b/streamer/src/nonblocking/quic.rs
index 38200ea15fe71a..f430fee6eadf55 100644
--- a/streamer/src/nonblocking/quic.rs
+++ b/streamer/src/nonblocking/quic.rs
@@ -333,6 +333,7 @@ fn handle_and_cache_new_connection(
         params.total_stake,
     ) as u64)
     {
+<<<<<<< HEAD
         connection.set_max_concurrent_uni_streams(max_uni_streams);
         let receive_window = compute_recieve_window(
             params.max_stake,
@@ -340,12 +341,11 @@ fn handle_and_cache_new_connection(
             connection_table_l.peer_type,
             params.stake,
         );
-
-        if let Ok(receive_window) = receive_window {
-            connection.set_receive_window(receive_window);
-        }
-
+=======
         let remote_addr = connection.remote_address();
+        let receive_window =
+            compute_recieve_window(params.max_stake, params.min_stake, params.peer_type);
+>>>>>>> 2770424782 (quic: delay calling set_max_concurrent_uni_streams/set_receive_window (#904))
 
         debug!(
             "Peer type: {:?}, stake {}, total stake {}, max streams {} receive_window {:?} from peer {}",
@@ -367,6 +367,12 @@ fn handle_and_cache_new_connection(
         ) {
             let peer_type = connection_table_l.peer_type;
             drop(connection_table_l);
+
+            if let Ok(receive_window) = receive_window {
+                connection.set_receive_window(receive_window);
+            }
+            connection.set_max_concurrent_uni_streams(max_uni_streams);
+
             tokio::spawn(handle_connection(
                 connection,
                 remote_addr,