diff --git a/src/globals.h b/src/globals.h
index 42f47a4..158ad9f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -23,7 +23,7 @@ typedef enum eEERequest
 typedef struct Globals_s
 {
   char DeviceName[33];
-  char DeviceName_ID[33+6];
+  char DeviceName_ID[42];
   tSystem_Status systemStatus = sysStat_Startup;
   tSystem_Status resumeStatus = sysStat_Startup;
   eEERequest requestEEAction = EE_IDLE;
diff --git a/src/main.cpp b/src/main.cpp
index 97d124f..5140ca4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -98,7 +98,7 @@ void setup()
   Serial.print("\n\n\n");
 
   strcpy(globals.DeviceName, DEVICE_NAME);
-  snprintf(globals.DeviceName_ID, 39, "%s_%06X", globals.DeviceName, ESP.getChipId());
+  snprintf(globals.DeviceName_ID, 41, "%s_%08X", globals.DeviceName, ESP.getChipId());
 
   pinMode(DIO_FAC_1_TRG, INPUT_PULLUP);
   pinMode(DIO_FAC_2_TRG, INPUT_PULLUP);