diff --git a/DGIdGateway/DGIdGateway.cpp b/DGIdGateway/DGIdGateway.cpp
index 7622910..9da6881 100644
--- a/DGIdGateway/DGIdGateway.cpp
+++ b/DGIdGateway/DGIdGateway.cpp
@@ -491,8 +491,11 @@ int CDGIdGateway::run()
 					CYSFFICH fich;
 					bool valid = fich.decode(buffer + 35U);
 					if (valid) {
-						fich.setDGId(i);
-						fich.encode(buffer + 35U);
+						unsigned char dgId = fich.getDGId();
+						if (dgId != WIRESX_DGID) {
+							fich.setDGId(i);
+							fich.encode(buffer + 35U);
+						}
 
 						rptNetwork.write(0U, buffer);
 
diff --git a/DGIdGateway/Version.h b/DGIdGateway/Version.h
index c7678fe..609091c 100644
--- a/DGIdGateway/Version.h
+++ b/DGIdGateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201107";
+const char* VERSION = "20201108";
 
 #endif