diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index c2a3315d76..ee3735fbad 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -4668,7 +4668,7 @@ static void printConfig(char *cmdline, bool doDiff)
 
         if (dumpMask & DUMP_ALL) {
             cliMcuId(NULL);
-#if defined(USE_BOARD_INFO) && defined(USE_SIGNATURE)
+#if defined(USE_SIGNATURE)
         cliSignature("");
 #endif
         }
@@ -4993,7 +4993,7 @@ const clicmd_t cmdTable[] = {
     CLI_COMMAND_DEF("servo", "configure servos", NULL, cliServo),
 #endif
     CLI_COMMAND_DEF("set", "change setting", "[<name>=<value>]", cliSet),
-#if defined(USE_BOARD_INFO) && defined(USE_SIGNATURE)
+#if defined(USE_SIGNATURE)
     CLI_COMMAND_DEF("signature", "get / set the board type signature", "[signature]", cliSignature),
 #endif
 #ifdef USE_SERVOS
diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index ddeee01b24..37f7cdf33d 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -515,12 +515,21 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
         value = getManufacturerId();
         sbufWriteU8(dst, strlen(value));
         sbufWriteString(dst, value);
+#else
+        sbufWriteU8(dst, 0);
+        sbufWriteU8(dst, 0);
+#endif
 
 #if defined(USE_SIGNATURE)
         // Signature
         sbufWriteData(dst, getSignature(), SIGNATURE_LENGTH);
+#else
+        uint8_t emptySignature[SIGNATURE_LENGTH];
+        memset(emptySignature, 0, sizeof(emptySignature));
+        sbufWriteData(dst, &emptySignature, sizeof(emptySignature));
 #endif
-#endif // USE_BOARD_INFO
+
+        sbufWriteU8(dst, MCU_TYPE_ID);
 
         break;
     }
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index d2dad6b657..f0367c20da 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -261,3 +261,7 @@
 #ifndef USE_DSHOT_TELEMETRY
 #undef USE_RPM_FILTER
 #endif
+
+#if !defined(USE_BOARD_INFO)
+#undef USE_SIGNATURE
+#endif