diff --git a/src/drivers/boards/common/stm32/board_identity.c b/src/drivers/boards/common/stm32/board_identity.c
index 41e52a186c..4a5f66c589 100644
--- a/src/drivers/boards/common/stm32/board_identity.c
+++ b/src/drivers/boards/common/stm32/board_identity.c
@@ -118,7 +118,7 @@ int board_get_mfguid_formated(char *format_buffer, int size)
 	board_get_mfguid(mfguid);
 	int offset  = 0;
 
-	for (unsigned i = 0; i < PX4_CPU_MFGUID_BYTE_LENGTH; i++) {
+	for (unsigned i = 0; offset < size && i < PX4_CPU_MFGUID_BYTE_LENGTH; i++) {
 		offset += snprintf(&format_buffer[offset], size - offset, "%02x", mfguid[i]);
 	}