diff --git a/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c b/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c
index e3bf04ddb2fd..4141c7e3b91d 100644
--- a/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c
+++ b/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c
@@ -15,7 +15,7 @@
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #if !defined(CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM)
-#define AWS_CLOUD_CLIENT_ID_LEN 15
+#define AWS_CLOUD_CLIENT_ID_LEN (HW_ID_LEN - 1)
 #else
 #define AWS_CLOUD_CLIENT_ID_LEN (sizeof(CONFIG_CLOUD_CLIENT_ID) - 1)
 #endif
diff --git a/applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c b/applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c
index 2f1d62c95bf5..a6c79ed33f6d 100644
--- a/applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c
+++ b/applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c
@@ -22,7 +22,7 @@
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #if !defined(CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM)
-#define LWM2M_INTEGRATION_CLIENT_ID_LEN 15
+#define LWM2M_INTEGRATION_CLIENT_ID_LEN (HW_ID_LEN - 1)
 #else
 #define LWM2M_INTEGRATION_CLIENT_ID_LEN (sizeof(CONFIG_CLOUD_CLIENT_ID) - 1)
 #endif