diff --git a/libi2pd/Profiling.cpp b/libi2pd/Profiling.cpp
index 6f805193..6909e209 100644
--- a/libi2pd/Profiling.cpp
+++ b/libi2pd/Profiling.cpp
@@ -175,7 +175,8 @@ namespace data
 	{
 		if (!m_LastDeclineTime) return false;
 		auto ts = i2p::util::GetSecondsSinceEpoch ();
-		if (ts > m_LastDeclineTime + PEER_PROFILE_DECLINED_RECENTLY_INTERVAL)
+		if (ts > m_LastDeclineTime + PEER_PROFILE_DECLINED_RECENTLY_INTERVAL ||
+		    ts + PEER_PROFILE_DECLINED_RECENTLY_INTERVAL < m_LastDeclineTime)
 			m_LastDeclineTime = 0;
 		return (bool)m_LastDeclineTime;
 	}	
@@ -200,7 +201,8 @@ namespace data
 	{
 		if (!m_LastUnreachableTime) return false;
 		auto ts = i2p::util::GetSecondsSinceEpoch ();
-		if (ts > m_LastUnreachableTime + PEER_PROFILE_UNREACHABLE_INTERVAL)
+		if (ts > m_LastUnreachableTime + PEER_PROFILE_UNREACHABLE_INTERVAL ||
+		    ts + PEER_PROFILE_UNREACHABLE_INTERVAL < m_LastUnreachableTime)
 			m_LastUnreachableTime = 0;
 		return (bool)m_LastUnreachableTime;
 	}	
diff --git a/libi2pd/TransportSession.h b/libi2pd/TransportSession.h
index 56f6b9bc..03ade393 100644
--- a/libi2pd/TransportSession.h
+++ b/libi2pd/TransportSession.h
@@ -107,7 +107,10 @@ namespace transport
 			int GetTerminationTimeout () const { return m_TerminationTimeout; };
 			void SetTerminationTimeout (int terminationTimeout) { m_TerminationTimeout = terminationTimeout; };
 			bool IsTerminationTimeoutExpired (uint64_t ts) const
-			{ return ts >= m_LastActivityTimestamp + GetTerminationTimeout (); };
+			{ 
+				return ts >= m_LastActivityTimestamp + GetTerminationTimeout () ||
+					ts + GetTerminationTimeout () < m_LastActivityTimestamp; 
+			};
 
 			uint32_t GetCreationTime () const { return m_CreationTime; };
 			void SetCreationTime (uint32_t ts) { m_CreationTime = ts; }; // for introducers