diff --git a/src/uci_utils.c b/src/uci_utils.c
index 11f8f9c..c04a278 100644
--- a/src/uci_utils.c
+++ b/src/uci_utils.c
@@ -737,6 +737,12 @@ end:
 	}
 	fclose(input);
 	pthread_mutex_unlock(&mutex_config_load);
+
+	if (ret == CWMP_OK) {
+		// Need to remove dmmap
+		set_uci_path_value(VARSTATE_CONFIG, "dmmap.dmmap.cleanup", "1");
+	}
+
 	return ret;
 }