diff --git a/src/edge_utils.c b/src/edge_utils.c
index 6bd56fc..436b738 100644
--- a/src/edge_utils.c
+++ b/src/edge_utils.c
@@ -3163,12 +3163,12 @@ int run_edge_loop (n2n_edge_t *eee, int *keep_running) {
 
     } /* while */
 
+    send_unregister_super(eee);
+
 #ifdef WIN32
     WaitForSingleObject(tun_read_thread, INFINITE);
 #endif
 
-    send_unregister_super(eee);
-
     closesocket(eee->sock);
 
     return(0);