diff --git a/NXDNGateway/NXDNGateway.cpp b/NXDNGateway/NXDNGateway.cpp
index 777f7ca..cc89c3a 100644
--- a/NXDNGateway/NXDNGateway.cpp
+++ b/NXDNGateway/NXDNGateway.cpp
@@ -557,8 +557,6 @@ void CNXDNGateway::run()
 
 		hangTimer.clock(ms);
 		if (hangTimer.isRunning() && hangTimer.hasExpired()) {
-			currentTG = 0U;
-
 			if (currentAddrLen > 0U) {
 				LogMessage("Unlinking from %u due to inactivity", currentTG);
 
@@ -575,6 +573,8 @@ void CNXDNGateway::run()
 
 				hangTimer.stop();
 			}
+
+			currentTG = 0U;
 		}
 
 		pollTimer.clock(ms);
diff --git a/NXDNGateway/Version.h b/NXDNGateway/Version.h
index 8a542ec..3118d15 100644
--- a/NXDNGateway/Version.h
+++ b/NXDNGateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201101";
+const char* VERSION = "20201102";
 
 #endif