diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index 001bf2fabc..d984be4cdd 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -71,7 +71,7 @@ Client::Client(
 	m_sendFileThread(NULL),
 	m_writeToDropDirThread(NULL),
 	m_socket(NULL),
-	m_useSecureNetwork(false),
+	m_useSecureNetwork(args.m_enableCrypto),
 	m_args(args),
 	m_enableClipboard(true)
 {
diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
index f8d07c198d..a9777aae1f 100644
--- a/src/lib/server/ClientListener.cpp
+++ b/src/lib/server/ClientListener.cpp
@@ -40,7 +40,7 @@ ClientListener::ClientListener(const NetworkAddress& address,
 	m_socketFactory(socketFactory),
 	m_server(NULL),
 	m_events(events),
-	m_useSecureNetwork(false)
+	m_useSecureNetwork(enableCrypto)
 {
 	assert(m_socketFactory != NULL);