diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 319d6079edb633..076a5dea682ed7 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -67,8 +67,8 @@ constexpr const char * kDeviceAddressKeyPrefix     = "DeviceAddress";
     do                                                                                                                             \
     {                                                                                                                              \
         const size_t len = strlen(keyPrefix);                                                                                      \
-        char key[len + sizeof(NodeId) + 1];                                                                                        \
-        snprintf(key, sizeof(key), "%s%llx", keyPrefix, node);                                                                     \
+        char key[len + 2 * sizeof(NodeId) + 1];                                                                                        \
+        snprintf(key, sizeof(key), "%s%" PRIx64, keyPrefix, node);                                                                     \
         action;                                                                                                                    \
     } while (0)