diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 3bb56f36ca..9996c8418d 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -260,7 +260,9 @@ function SimpleForm.__init__(self, config, title, description, data)
 end
 
 function SimpleForm.parse(self, ...)
-	Node.parse(self, 1, ...)
+	if luci.http.formvalue("cbi.submit") then
+		Node.parse(self, 1, ...)
+	end
 		
 	local valid = true
 	for i, v in ipairs(self.children) do