diff --git a/lib/ngtcp2_conn.c b/lib/ngtcp2_conn.c
index d722fd0a9c0f489dc8372b9422f9518da88013b4..6691d810da07854db3faedbbd1fe86e190059449 100644
--- a/lib/ngtcp2_conn.c
+++ b/lib/ngtcp2_conn.c
@@ -901,8 +901,6 @@ int ngtcp2_conn_server_new(ngtcp2_conn **pconn, const ngtcp2_cid *dcid,
                            const ngtcp2_settings *settings,
                            const ngtcp2_mem *mem, void *user_data) {
   int rv;
-  ngtcp2_transport_params *params;
-
   rv = conn_new(pconn, dcid, scid, path, version, callbacks, settings, mem,
                 user_data, 1);
   if (rv != 0) {
@@ -912,12 +910,6 @@ int ngtcp2_conn_server_new(ngtcp2_conn **pconn, const ngtcp2_cid *dcid,
   (*pconn)->local.bidi.next_stream_id = 1;
   (*pconn)->local.uni.next_stream_id = 3;
 
-  params = &(*pconn)->local.settings.transport_params;
-  if (dcid->datalen == 0) {
-    /* Client uses zero-length Connection ID */
-    params->active_connection_id_limit = 0;
-  }
-
   if ((*pconn)->local.settings.token.len) {
     /* Usage of token lifts amplification limit */
     (*pconn)->flags |= NGTCP2_CONN_FLAG_SADDR_VERIFIED;