--- a/src/internet/model/tcp-socket-base.cc	Fri Sep 04 01:10:45 2015 +0200
+++ b/src/internet/model/tcp-socket-base.cc	Thu Sep 03 21:12:22 2015 -0700
@@ -2575,9 +2575,10 @@
         }
     }
 
+  bool timestampAttribute = m_timestampEnabled;
   m_timestampEnabled = false;
 
-  if (header.HasOption (TcpOption::TS))
+  if (header.HasOption (TcpOption::TS) && timestampAttribute)
     {
       m_timestampEnabled = true;
       ProcessOptionTimestamp (header.GetOption (TcpOption::TS));