diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 0bcc48202c92..31458e689303 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -2776,7 +2776,7 @@ add(int ac, char *av[])
 	/*
 	 * put back the have_state command as last opcode
 	 */
-	if (have_state) {
+	if (have_state && have_state->opcode != O_CHECK_STATE) {
 		i = F_LEN(have_state);
 		bcopy(have_state, dst, i * sizeof(u_int32_t));
 		dst += i;