diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86a0cbbf..fc9213a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 4)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 7)
+set(AGENT_VERSION_BUILD 8)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
diff --git a/src/mtconnect/configuration/agent_config.cpp b/src/mtconnect/configuration/agent_config.cpp
index ee3a7381..eb9007ee 100644
--- a/src/mtconnect/configuration/agent_config.cpp
+++ b/src/mtconnect/configuration/agent_config.cpp
@@ -1034,6 +1034,7 @@ namespace mtconnect::configuration {
         {
           // Set the UUID of the device
           m_agent->deviceChanged(device, *uuid);
+          adapterOptions[configuration::Device] = *uuid;
         }
 
         auto preserve = GetOption<bool>(adapterOptions, configuration::PreserveUUID);