diff --git a/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.h b/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.h
--- a/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.h
+++ b/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.h
@@ -27,6 +27,7 @@
   static const std::string OPTION_NOTIFS_APNS_TOPIC;
   static const std::string OPTION_NOTIFS_FCM_SERVER_KEY;
   static const std::string OPTION_SESSIONS_SKIP_AUTH_KEY;
+  static const std::string OPTION_DISABLE_DEVICEID_VALIDATION;
 
   static ConfigManager &getInstance();
   void load();
diff --git a/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.cpp b/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.cpp
--- a/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.cpp
+++ b/services/tunnelbroker/src/libcpp/src/Tools/ConfigManager.cpp
@@ -33,6 +33,8 @@
     "notifications.fcm_server_key";
 const std::string ConfigManager::OPTION_SESSIONS_SKIP_AUTH_KEY =
     "sessions.skip_authentication";
+const std::string ConfigManager::OPTION_DISABLE_DEVICEID_VALIDATION =
+    "sessions.disable_deviceid_validation";
 
 ConfigManager &ConfigManager::getInstance() {
   static ConfigManager instance;
@@ -118,6 +120,9 @@
     description.add_options()(
         this->OPTION_SESSIONS_SKIP_AUTH_KEY.c_str(),
         "Skip sessions authentication mechanism");
+    description.add_options()(
+        this->OPTION_DISABLE_DEVICEID_VALIDATION.c_str(),
+        "Disable deviceID format validation");
 
     boost::program_options::parsed_options parsedDescription =
         boost::program_options::parse_config_file(