diff --git a/board/nm/nmhw21/board.c b/board/nm/nmhw21/board.c
index b82882cab0..f0895a2f84 100644
--- a/board/nm/nmhw21/board.c
+++ b/board/nm/nmhw21/board.c
@@ -535,7 +535,13 @@ static void init_bd_spl(void)
 	hw_type = 21;	/* Assume hw21, unless BD tells different */
 
 	if (read_eeprom() >= 0) {
-		bd_get_hw_type(&hw_type);
+		int hw_type_from_bd = -1;
+
+		/* If entry is found returns value, otherwise 0 */
+		bd_get_hw_type(&hw_type_from_bd);
+		if (hw_type_from_bd != 0) {
+			hw_type = hw_type_from_bd;
+		}
 	}
 	else {
 		puts("Could not get board ID.\n");