diff --git a/squeaknode/network/connection_manager.py b/squeaknode/network/connection_manager.py
index 3064847d..88e68582 100644
--- a/squeaknode/network/connection_manager.py
+++ b/squeaknode/network/connection_manager.py
@@ -1,6 +1,8 @@
 import logging
 import threading
 from typing import Dict
+from typing import List
+from typing import Optional
 
 from squeaknode.core.peer_address import PeerAddress
 from squeaknode.network.peer import Peer
@@ -24,7 +26,7 @@ class ConnectionManager(object):
         self.peers_changed_callbacks = {}
 
     @property
-    def peers(self):
+    def peers(self) -> List[Peer]:
         return list(self._peers.values())
 
     def has_connection(self, address):
@@ -76,7 +78,7 @@ class ConnectionManager(object):
             logger.debug('Removed peer {}'.format(peer))
             self.on_peers_changed()
 
-    def get_peer(self, address):
+    def get_peer(self, address) -> Optional[Peer]:
         """Get a peer info by address.
         """
         return self._peers.get(address)
diff --git a/squeaknode/network/network_manager.py b/squeaknode/network/network_manager.py
index bc61d840..7dc225eb 100644
--- a/squeaknode/network/network_manager.py
+++ b/squeaknode/network/network_manager.py
@@ -1,6 +1,7 @@
 import logging
 import socket
 from typing import List
+from typing import Optional
 
 import squeak.params
 from squeak.messages import MsgSerializable
@@ -66,10 +67,10 @@ class NetworkManager(object):
     def disconnect_peer(self, peer_address: PeerAddress) -> None:
         self.connection_manager.stop_connection(peer_address)
 
-    def get_connected_peer(self, peer_address: PeerAddress) -> List[Peer]:
+    def get_connected_peer(self, peer_address: PeerAddress) -> Optional[Peer]:
         return self.connection_manager.get_peer(peer_address)
 
-    def get_connected_peers(self):
+    def get_connected_peers(self) -> List[Peer]:
         return self.connection_manager.peers
 
     def broadcast_msg(self, msg: MsgSerializable) -> None: