diff --git a/omr-dscp/files/etc/init.d/omr-dscp-nft b/omr-dscp/files/etc/init.d/omr-dscp-nft
index 19aa9d589..b1da1b3c7 100755
--- a/omr-dscp/files/etc/init.d/omr-dscp-nft
+++ b/omr-dscp/files/etc/init.d/omr-dscp-nft
@@ -130,6 +130,9 @@ _add_fwmark_chain() {
 	done
 }
 
+_remove_old_ipset_dnsmasq() {
+	[ -n "$(uci -q get dhcp.${1}.name | grep omr)" ] && uci -q delete dhcp.$1
+}
 _remove_ipset_dnsmasq() {
 	[ -n "$(echo $1 | grep omr_dscp)" ] && uci -q delete dhcp.$1
 }
@@ -151,6 +154,7 @@ _cleanup() {
 	uci -q del dhcp.@dnsmasq[0].ipset
 	config_load dhcp
 	config_foreach _remove_ipset_dnsmasq
+	config_foreach _remove_old_ipset_dnsmasq
 	config_load firewall
 	config_foreach _remove_rules
 	uci -q commit dhcp