diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
index 23dbff6b2..35afc5309 100644
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -769,10 +769,8 @@ TcpSocketBase::CloseAndNotify (void)
     {
       NotifyNormalClose ();
     }
-  if (m_state != TIME_WAIT)
-    {
-      DeallocateEndPoint ();
-    }
+
+  DeallocateEndPoint ();
   m_closeNotified = true;
   NS_LOG_INFO (TcpStateName[m_state] << " -> CLOSED");
   CancelAllTimers ();