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
@@ -28,6 +28,7 @@
   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 const std::string OPTION_MESSAGES_SKIP_PERSISTENCE;
 
   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
@@ -35,6 +35,8 @@
     "sessions.skip_authentication";
 const std::string ConfigManager::OPTION_DISABLE_DEVICEID_VALIDATION =
     "sessions.disable_deviceid_validation";
+const std::string ConfigManager::OPTION_MESSAGES_SKIP_PERSISTENCE =
+    "messages.skip_persistence";
 
 ConfigManager &ConfigManager::getInstance() {
   static ConfigManager instance;
@@ -126,6 +128,11 @@
         boost::program_options::value<bool>()->default_value(false),
         "Disable deviceID format validation");
 
+    description.add_options()(
+        this->OPTION_MESSAGES_SKIP_PERSISTENCE.c_str(),
+        boost::program_options::value<bool>()->default_value(false),
+        "Disable messages persistence in DynamoDB database");
+
     boost::program_options::parsed_options parsedDescription =
         boost::program_options::parse_config_file(
             fileStream, description, true);