diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 186dd9ccc..1a13c0d9b 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -78,7 +78,7 @@ void SecureSocket::close()
 
 void SecureSocket::connect(const NetworkAddress &addr)
 {
-  m_events->addHandler(EventTypes::DataSocketConnected, getEventTarget(), [this](const auto &e) {
+  getEvents()->addHandler(EventTypes::DataSocketConnected, getEventTarget(), [this](const auto &e) {
     handleTCPConnected(e);
   });
   TCPSocket::connect(addr);
diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h
index 9cb256f14..f007f04f6 100644
--- a/src/lib/net/TCPSocket.h
+++ b/src/lib/net/TCPSocket.h
@@ -123,7 +123,6 @@ protected:
   void sendEvent(EventTypes);
   void discardWrittenData(int bytesWrote);
 
-  IEventQueue *m_events;
   StreamBuffer m_inputBuffer;
   StreamBuffer m_outputBuffer;
 
@@ -144,6 +143,7 @@ private:
   bool m_connected;
   Mutex m_mutex;
   ArchSocket m_socket;
+  IEventQueue *m_events;
   CondVar<bool> m_flushed;
   SocketMultiplexer *m_socketMultiplexer;
 };