diff --git a/modules/luci-base/luasrc/view/cbi/dynlist.htm b/modules/luci-base/luasrc/view/cbi/dynlist.htm
index 4d0b50942b..fa7dbdb418 100644
--- a/modules/luci-base/luasrc/view/cbi/dynlist.htm
+++ b/modules/luci-base/luasrc/view/cbi/dynlist.htm
@@ -6,22 +6,8 @@
 		self.keylist, self.vallist,
 		self.datatype, self.optional or self.rmempty
 	})) ..
-
+	attr("data-values", luci.util.serialize_json(self:cfgvalue(section))) ..
 	ifattr(self.size, "data-size", self.size) ..
 	ifattr(self.placeholder, "data-placeholder", self.placeholder)
-%>>
-<%
-	local vals = self:cfgvalue(section) or {}
-	for i=1, #vals + 1 do
-		local val = vals[i]
-		if (val and #val > 0) or (i == 1) then
-%>
-	<input class="cbi-input-text" value="<%=pcdata(val)%>" data-update="change" type="text"<%=
-		attr("id", cbid .. "." .. i) ..
-		attr("name", cbid) ..
-		ifattr(self.size, "size") ..
-		ifattr(i == 1 and self.placeholder, "placeholder", self.placeholder)
-	%> /><br />
-<% end end %>
-</div>
+%>></div>
 <%+cbi/valuefooter%>