diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 2b4d04c..da0cdaf 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -543,8 +543,7 @@
                        config.IdleNetworkTimeout());
     idle_timeout_connection_close_behavior_ =
         ConnectionCloseBehavior::SILENT_CLOSE;
-    if (GetQuicReloadableFlag(quic_add_silent_idle_timeout) &&
-        perspective_ == Perspective::IS_SERVER) {
+    if (perspective_ == Perspective::IS_SERVER) {
       idle_timeout_connection_close_behavior_ = ConnectionCloseBehavior::
           SILENT_CLOSE_WITH_CONNECTION_CLOSE_PACKET_SERIALIZED;
     }
@@ -2692,7 +2691,6 @@
     termination_packets_->emplace_back(
         new QuicEncryptedPacket(buffer_copy, encrypted_length, true));
     if (error_code == QUIC_SILENT_IDLE_TIMEOUT) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_add_silent_idle_timeout);
       DCHECK_EQ(Perspective::IS_SERVER, perspective_);
       // TODO(fayang): populate histogram indicating the time elapsed from this
       // connection gets closed to following client packets get received.
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 0fa0b49..b18b367 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -10954,47 +10954,10 @@
               OnConnectionClosed(_, ConnectionCloseSource::FROM_SELF));
   EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(0);
   connection_.GetTimeoutAlarm()->Fire();
-  if (GetQuicReloadableFlag(quic_add_silent_idle_timeout)) {
-    // Verify the connection close packets get serialized and added to
-    // termination packets list.
-    EXPECT_NE(nullptr,
-              QuicConnectionPeer::GetConnectionClosePacket(&connection_));
-  } else {
-    // Verify no connection close packet is serialized.
-    EXPECT_EQ(nullptr,
-              QuicConnectionPeer::GetConnectionClosePacket(&connection_));
-  }
-}
-
-TEST_P(QuicConnectionTest, NoSilentClose) {
-  SetQuicReloadableFlag(quic_add_silent_idle_timeout, false);
-  set_perspective(Perspective::IS_SERVER);
-  QuicPacketCreatorPeer::SetSendVersionInPacket(creator_, false);
-  if (version().SupportsAntiAmplificationLimit()) {
-    QuicConnectionPeer::SetAddressValidated(&connection_);
-  }
-
-  QuicConfig config;
-  QuicTagVector connection_options;
-  connection_options.push_back(kNSLC);
-  config.SetInitialReceivedConnectionOptions(connection_options);
-  QuicConfigPeer::SetNegotiated(&config, true);
-  if (connection_.version().AuthenticatesHandshakeConnectionIds()) {
-    QuicConfigPeer::SetReceivedOriginalConnectionId(
-        &config, connection_.connection_id());
-    QuicConfigPeer::SetReceivedInitialSourceConnectionId(&config,
-                                                         QuicConnectionId());
-  }
-  EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
-  connection_.SetFromConfig(config);
-
-  EXPECT_TRUE(connection_.connected());
-  EXPECT_TRUE(connection_.GetTimeoutAlarm()->IsSet());
-
-  EXPECT_CALL(visitor_,
-              OnConnectionClosed(_, ConnectionCloseSource::FROM_SELF));
-  connection_.GetTimeoutAlarm()->Fire();
-  TestConnectionCloseQuicErrorCode(QUIC_NETWORK_IDLE_TIMEOUT);
+  // Verify the connection close packets get serialized and added to
+  // termination packets list.
+  EXPECT_NE(nullptr,
+            QuicConnectionPeer::GetConnectionClosePacket(&connection_));
 }
 
 TEST_P(QuicConnectionTest, DonotSendPing) {
