diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 46c41fe705..30ec6ee04a 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -185,6 +185,12 @@ if(is_array($config['gifs']['gif'])){
  * could be failing back in which case we need to switch IPs back anyhow.
  */
 if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interfaces'][$interface]['ipaddr'])) {
+	/* option to flush state table on IP change */
+	if (isset($config['system']['ip_change_kill_states'])) {
+		log_error("Killing all states post-IP change.");
+		filter_flush_state_table();
+	}
+	
 	/* reconfigure static routes (kernel may have deleted them) */
 	system_routing_configure($interface);