diff --git a/CHANGES b/CHANGES
index 90db4ec9737..4ba98432217 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2578] Close the client connection when you close TransformTerminus
+
   *) [TS-1893] Add more options to server session control.
 
   *) [TS-2239] Initial ALPN TLS extension support.
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index 2da3301f68c..6ea9f992520 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -251,20 +251,16 @@ TransformTerminus::handle_event(int event, void * /* edata ATS_UNUSED */)
       // exist).
       if (m_tvc->m_closed == 0) {
         if (m_closed == TS_VC_CLOSE_ABORT) {
-          if (m_read_vio.op == VIO::NONE) {
-            if (!m_called_user) {
-              m_called_user = 1;
-              m_tvc->m_cont->handleEvent(VC_EVENT_ERROR, NULL);
-            }
+          if (m_read_vio.op == VIO::NONE && !m_called_user) {
+            m_called_user = 1;
+            m_tvc->m_cont->handleEvent(VC_EVENT_ERROR, NULL);
           } else {
             m_read_vio._cont->handleEvent(VC_EVENT_ERROR, &m_read_vio);
           }
         } else {
-          if (m_read_vio.op == VIO::NONE) {
-            if (!m_called_user) {
-              m_called_user = 1;
-              m_tvc->m_cont->handleEvent(VC_EVENT_EOS, NULL);
-            }
+          if (m_read_vio.op == VIO::NONE && !m_called_user) {
+            m_called_user = 1;
+            m_tvc->m_cont->handleEvent(VC_EVENT_EOS, NULL);
           } else {
             m_read_vio._cont->handleEvent(VC_EVENT_EOS, &m_read_vio);
           }