diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c
index 8f5bcd2ff..c376b0fe6 100644
--- a/src/detection/board/board_linux.c
+++ b/src/detection/board/board_linux.c
@@ -23,7 +23,8 @@ static bool hostValueSet(FFstrbuf* value)
         ffStrbufIgnCaseCompS(value, "Not Applicable") != 0 &&
         ffStrbufIgnCaseCompS(value, "INVALID") != 0 &&
         ffStrbufIgnCaseCompS(value, "Type1ProductConfigId") != 0 &&
-        ffStrbufIgnCaseCompS(value, "All Series") != 0
+        ffStrbufIgnCaseCompS(value, "All Series") != 0 &&
+        ffStrbufIgnCaseCompS(value, "N/A") != 0
     ;
 }
 
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
index bb0027d9d..b590d96b0 100644
--- a/src/modules/board/board.c
+++ b/src/modules/board/board.c
@@ -26,7 +26,10 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
-        puts(result.boardName.chars);
+        ffStrbufWriteTo(&result.boardName, stdout);
+        if (result.boardVersion.length)
+            printf(" (%s)", result.boardVersion.chars);
+        putchar('\n');
     }
     else
     {