diff --git a/src/main/cms/cms_menu_firmware.c b/src/main/cms/cms_menu_firmware.c
index 82cb447cf2..bf0faa80fa 100644
--- a/src/main/cms/cms_menu_firmware.c
+++ b/src/main/cms/cms_menu_firmware.c
@@ -195,10 +195,10 @@ static const void *cmsx_FirmwareInit(displayPort_t *pDisp)
 {
     UNUSED(pDisp);
 
-    strncpy(manufacturerId, getManufacturerId(), MAX_MANUFACTURER_ID_LENGTH + 1);
-    manufacturerId[MAX_MANUFACTURER_ID_LENGTH] = 0;
-    strncpy(boardName, getBoardName(), MAX_BOARD_NAME_LENGTH + 1);
-    boardName[MAX_BOARD_NAME_LENGTH] = 0;
+    strncpy(manufacturerId, getManufacturerId(), MAX_MANUFACTURER_ID_LENGTH);
+    manufacturerId[MAX_MANUFACTURER_ID_LENGTH - 1] = '\0';
+    strncpy(boardName, getBoardName(), MAX_BOARD_NAME_LENGTH);
+    boardName[MAX_BOARD_NAME_LENGTH - 1] = '\0';
 
     return NULL;
 }
diff --git a/src/main/fc/board_info.c b/src/main/fc/board_info.c
index e6f56c4222..33125f59d7 100644
--- a/src/main/fc/board_info.c
+++ b/src/main/fc/board_info.c
@@ -29,8 +29,8 @@
 
 #if !defined(BOARD_NAME)
 static bool boardInformationSet = false;
-static char manufacturerId[MAX_MANUFACTURER_ID_LENGTH];
-static char boardName[MAX_BOARD_NAME_LENGTH];
+static char manufacturerId[MAX_MANUFACTURER_ID_LENGTH + 1];
+static char boardName[MAX_BOARD_NAME_LENGTH + 1];
 static bool boardInformationWasUpdated = false;
 #endif