diff --git a/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp b/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp
index f23810f..f25df80 100644
--- a/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp
+++ b/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.cpp
@@ -167,6 +167,7 @@ CMessagesEndPointSession::CMessagesEndPointSession(
 	, m_messageEndPointOwner( endPoint )
 {
 	m_pConnection = nullptr;
+	m_bAppScheduledTimeout = false;
 	m_bConnectionWasEverConnected = false;
 
 	MarkUsed( SteamNetworkingSockets_GetLocalTimestamp() );
@@ -183,6 +184,7 @@ CMessagesEndPointSession::~CMessagesEndPointSession()
 void CMessagesEndPointSession::MarkUsed( SteamNetworkingMicroseconds usecNow )
 {
 	m_usecIdleTimeout = usecNow + k_usecSteamNetworkingP2PSessionIdleTimeout;
+	m_bAppScheduledTimeout = false;
 	ScheduleThink();
 }
 
diff --git a/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.h b/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.h
index 0ee4d6f..60e086f 100644
--- a/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.h
+++ b/src/steamnetworkingsockets/clientlib/csteamnetworkingmessages.h
@@ -86,6 +86,9 @@ public:
 	/// and we should clean it up.
 	SteamNetworkingMicroseconds m_usecIdleTimeout;
 
+	/// Try if the app scheduled cleanup
+	bool m_bAppScheduledTimeout;
+
 	/// True if the current connection ever managed to go fully connected
 	bool m_bConnectionWasEverConnected;