diff --git a/electrumx/server/peers.py b/electrumx/server/peers.py
index 5849bc3..03b6495 100644
--- a/electrumx/server/peers.py
+++ b/electrumx/server/peers.py
@@ -37,8 +37,8 @@ class PeerSession(ClientSession):
         self.peer_mgr = peer_mgr
         self.kind = kind
         self.timeout = 20 if self.peer.is_tor else 10
-        context = {'conn_id': f'{host}'}
-        self.logger = ConnectionLogger(self.logger, context)
+        self.logger = class_logger(__name__, self.__class__.__name__)
+        self.logger = ConnectionLogger(self.logger, {'conn_id': f'{host}'})
 
     def connection_made(self, transport):
         super().connection_made(transport)
diff --git a/electrumx/server/session.py b/electrumx/server/session.py
index c18d78a..072e442 100644
--- a/electrumx/server/session.py
+++ b/electrumx/server/session.py
@@ -51,6 +51,7 @@ class SessionBase(ServerSession):
 
     def __init__(self, controller, kind):
         super().__init__(rpc_protocol=JSONRPCAutoDetect)
+        self.logger = util.class_logger(__name__, self.__class__.__name__)
         self.kind = kind  # 'RPC', 'TCP' etc.
         self.controller = controller
         self.bp = controller.bp