diff --git a/modules/luci-base/htdocs/luci-static/resources/uci.js b/modules/luci-base/htdocs/luci-static/resources/uci.js
index 916dbb310b..6bbd1bc37c 100644
--- a/modules/luci-base/htdocs/luci-static/resources/uci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/uci.js
@@ -547,9 +547,13 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
 				c[conf][sid] = {};
 
 			/* undelete option */
-			if (d[conf] && d[conf][sid])
+			if (d[conf] && d[conf][sid]) {
 				d[conf][sid] = d[conf][sid].filter(function(o) { return o !== opt });
 
+				if (d[conf][sid].length == 0)
+					delete d[conf][sid];
+			}
+
 			c[conf][sid][opt] = val;
 		}
 		else {