diff --git a/libp2p/switch.nim b/libp2p/switch.nim
index 5bb6bdd..52277c7 100644
--- a/libp2p/switch.nim
+++ b/libp2p/switch.nim
@@ -239,7 +239,7 @@ proc start*(s: Switch): Future[seq[Future[void]]] {.async, gcsafe.} =
   proc handle(conn: Connection): Future[void] {.async, closure, gcsafe.} =
     try:
         await s.upgradeIncoming(conn) # perform upgrade on incoming connection
-    except:
+    finally:
       await s.cleanupConn(conn)
 
   var startFuts: seq[Future[void]]