diff --git a/common/host_command.c b/common/host_command.c
index 6bb6176afd..dd390150aa 100644
--- a/common/host_command.c
+++ b/common/host_command.c
@@ -626,6 +626,7 @@ DECLARE_HOST_COMMAND(EC_CMD_TEST_PROTOCOL,
 /*****************************************************************************/
 /* Console commands */
 
+#ifdef CONFIG_CMD_HOSTCMD
 static int parse_byte(char *b, uint8_t *out)
 {
 	int i;
@@ -726,6 +727,7 @@ DECLARE_CONSOLE_COMMAND(hostcmd, command_host_command,
 			"cmd ver param",
 			"Fake host command",
 			NULL);
+#endif /* CONFIG_CMD_HOSTCMD */
 
 static int command_hcdebug(int argc, char **argv)
 {
diff --git a/include/config.h b/include/config.h
index 4f792a7975..4ea2f55dd1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -317,6 +317,7 @@
 #undef CONFIG_CMD_ECTEMP
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_GSV
+#undef CONFIG_CMD_HOSTCMD
 #undef CONFIG_CMD_ILIM
 #undef CONFIG_CMD_JUMPTAGS
 #define CONFIG_CMD_LID_ANGLE