diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index 4090c3515f..001bf2fabc 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -152,8 +152,7 @@ Client::connect()
 
 		// filter socket messages, including a packetizing filter
 		m_stream = socket;
-		bool adopt = !m_useSecureNetwork;
-		m_stream = new PacketStreamFilter(m_events, m_stream, adopt);
+		m_stream = new PacketStreamFilter(m_events, m_stream, true);
 
 		// connect
 		LOG((CLOG_DEBUG1 "connecting to server"));
diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
index 3bd7656b00..f8d07c198d 100644
--- a/src/lib/server/ClientListener.cpp
+++ b/src/lib/server/ClientListener.cpp
@@ -155,8 +155,7 @@ ClientListener::handleClientAccepted(const Event&, void* vsocket)
 	IDataSocket* socket = static_cast<IDataSocket*>(vsocket);
 	
 	// filter socket messages, including a packetizing filter
-	bool adopt = !m_useSecureNetwork;
-	synergy::IStream* stream = new PacketStreamFilter(m_events, socket, adopt);
+	synergy::IStream* stream = new PacketStreamFilter(m_events, socket, true);
 	assert(m_server != NULL);
 
 	// create proxy for unknown client