diff --git a/common/src/defaults.rs b/common/src/defaults.rs
index e5a94e4..8f942bc 100644
--- a/common/src/defaults.rs
+++ b/common/src/defaults.rs
@@ -1,4 +1,4 @@
-pub const DEFAULT_MAX_STREAMS: u64 = 64 * 1024;
+pub const DEFAULT_MAX_STREAMS: u64 = 96 * 1024;
 pub const MAX_ALLOWED_PARTIAL_RESPONSES: u64 = DEFAULT_MAX_STREAMS - 1;
 pub const DEFAULT_MAX_RECIEVE_WINDOW_SIZE: u64 = 1024 * 1024; // 1 MBs
 pub const DEFAULT_CONNECTION_TIMEOUT: u64 = 10;
diff --git a/server/src/quiche_server_loop.rs b/server/src/quiche_server_loop.rs
index fdda40d..60b97c9 100644
--- a/server/src/quiche_server_loop.rs
+++ b/server/src/quiche_server_loop.rs
@@ -367,9 +367,6 @@ fn create_client_task(
 
             if !connection.is_closed() && connection.is_established() {
                 while partial_responses.len() < max_allowed_partial_responses {
-                    if connection.is_closed() || !connection.is_established() {
-                        break;
-                    }
                     let close = match message_channel.try_recv() {
                         Ok((message, priority)) => {
                             message_count.fetch_sub(1, std::sync::atomic::Ordering::Relaxed);
@@ -386,6 +383,7 @@ fn create_client_task(
                                         e
                                     );
                                 }
+                                break;
                             }
                             send_message(
                                 &mut connection,
@@ -397,7 +395,9 @@ fn create_client_task(
                         }
                         Err(e) => {
                             match e {
-                                mpsc::TryRecvError::Empty => false,
+                                mpsc::TryRecvError::Empty => {
+                                    break;
+                                }
                                 mpsc::TryRecvError::Disconnected => {
                                     // too many message the connection is lagging
                                     true