diff --git a/src/main/fc/board_info.c b/src/main/fc/board_info.c
index d9e5cd13f5..b1385a0912 100644
--- a/src/main/fc/board_info.c
+++ b/src/main/fc/board_info.c
@@ -90,6 +90,7 @@ bool setManufacturerId(const char *newManufacturerId)
     if (!boardInformationSet || strlen(manufacturerId) == 0) {
         strncpy(manufacturerId, newManufacturerId, MAX_MANUFACTURER_ID_LENGTH);
         manufacturerId[MAX_MANUFACTURER_ID_LENGTH] = 0;
+
         boardInformationWasUpdated = true;
 
         return true;
@@ -108,6 +109,7 @@ bool setBoardName(const char *newBoardName)
     if (!boardInformationSet || strlen(boardName) == 0) {
         strncpy(boardName, newBoardName, MAX_BOARD_NAME_LENGTH);
         boardName[MAX_BOARD_NAME_LENGTH] = 0;
+
         boardInformationWasUpdated = true;
 
         return true;
@@ -125,7 +127,9 @@ bool persistBoardInformation(void)
 #if !defined(BOARD_NAME)
     if (boardInformationWasUpdated) {
         strncpy(boardConfigMutable()->manufacturerId, manufacturerId, MAX_MANUFACTURER_ID_LENGTH);
+        boardConfigMutable()->manufacturerId[MAX_MANUFACTURER_ID_LENGTH] = 0;
         strncpy(boardConfigMutable()->boardName, boardName, MAX_BOARD_NAME_LENGTH);
+        boardConfigMutable()->boardName[MAX_BOARD_NAME_LENGTH] = 0;
         boardConfigMutable()->boardInformationSet = true;
 
         initBoardInformation();