diff --git a/connection.go b/connection.go
index d8fdc556..a7dfdfa4 100644
--- a/connection.go
+++ b/connection.go
@@ -278,9 +278,7 @@ func (conn *LocalConnection) handleShutdown() {
 	// try to send any more
 	conn.stopForwarders()
 
-	if conn.remote != nil {
-		conn.Router.ConnectionMaker.ConnectionTerminated(conn.remoteTCPAddr)
-	}
+	conn.Router.ConnectionMaker.ConnectionTerminated(conn.remoteTCPAddr)
 }
 
 func (conn *LocalConnection) handshake(acceptNewPeer bool) error {