diff --git a/NearbyShare/NearbyConnection.swift b/NearbyShare/NearbyConnection.swift
index 2027acc..637e800 100644
--- a/NearbyShare/NearbyConnection.swift
+++ b/NearbyShare/NearbyConnection.swift
@@ -411,9 +411,10 @@ class NearbyConnection {
     
     func disconnect() {
         connection.send(content: nil, isComplete: true, completion: .contentProcessed { _ in
-            self.handleConnectionClosure()
         })
+        self.handleConnectionClosure()
         connectionClosed = true
+        connection.stateUpdateHandler = nil
     }
     
     func sendDisconnectionAndDisconnect() throws {