diff --git a/libexec/rc/rc.d/ipfilter b/libexec/rc/rc.d/ipfilter
index 1253294b09c..a68e6f60a6f 100755
--- a/libexec/rc/rc.d/ipfilter
+++ b/libexec/rc/rc.d/ipfilter
@@ -33,14 +33,11 @@ required_modules="ipl:ipfilter"
 ipfilter_start()
 {
 	echo "Enabling ipfilter."
+	if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then
+		${ipfilter_program:-/sbin/ipf} -E
+	fi
 	if [ -n "${ipfilter_optionlist}" ]; then
-		if ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then
-			${ipfilter_program:-/sbin/ipf} -D
-		fi
 		${ipfilter_program:-/sbin/ipf} -T "${ipfilter_optionlist}"
-		${ipfilter_program:-/sbin/ipf} -E
-	elif ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then
-		${ipfilter_program:-/sbin/ipf} -E
 	fi
 	${ipfilter_program:-/sbin/ipf} -Fa
 	if [ -r "${ipfilter_rules}" ]; then