diff --git a/P25Gateway/P25Gateway.cpp b/P25Gateway/P25Gateway.cpp
index f08d61c..3fcf655 100644
--- a/P25Gateway/P25Gateway.cpp
+++ b/P25Gateway/P25Gateway.cpp
@@ -529,8 +529,6 @@ void CP25Gateway::run()
 
 		hangTimer.clock(ms);
 		if (hangTimer.isRunning() && hangTimer.hasExpired()) {
-			currentTG = 0U;
-
 			if (currentAddrLen > 0U) {
 				LogMessage("Unlinking from %u due to inactivity", currentTG);
 
@@ -547,6 +545,8 @@ void CP25Gateway::run()
 
 				hangTimer.stop();
 			}
+
+			currentTG = 0U;
 		}
 
 		pollTimer.clock(ms);
diff --git a/P25Gateway/Version.h b/P25Gateway/Version.h
index 8d5b383..0272115 100644
--- a/P25Gateway/Version.h
+++ b/P25Gateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201101";
+const char* VERSION = "20201102";
 
 #endif