diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c
index 50a256cbac..6c02337698 100644
--- a/tools/imx8mimage.c
+++ b/tools/imx8mimage.c
@@ -99,8 +99,6 @@ static void parse_cfg_cmd(int32_t cmd, char *token, char *name, int lineno)
 		break;
 	case CMD_SIGNED_HDMI:
 		signed_hdmi = token;
-	case CMD_FIT:
-		using_fit = 1;
 		break;
 	case CMD_DDR_FW:
 		/* Do nothing */
@@ -120,6 +118,11 @@ static void parse_cfg_fld(int32_t *cmd, char *token,
 				name, lineno, token);
 			exit(EXIT_FAILURE);
 		}
+		switch (*cmd) {
+		case CMD_FIT:
+			using_fit = 1;
+			break;
+		}
 		break;
 	case CFG_REG_SIZE:
 		parse_cfg_cmd(*cmd, token, name, lineno);