diff --git a/util/templates/documentation.go b/util/templates/documentation.go
index b1d248298..0308690a5 100644
--- a/util/templates/documentation.go
+++ b/util/templates/documentation.go
@@ -21,23 +21,22 @@ func (t *Template) RenderDocumentation(product Product, lang string) ([]byte, er
 	values := t.Defaults(RenderModeDocs)
 
 	for index, p := range t.Params {
-		for k, v := range values {
-			if p.Name != k {
-				continue
-			}
+		v, ok := values[p.Name]
+		if !ok {
+			continue
+		}
 
-			switch p.Type {
-			case TypeStringList:
-				for _, e := range v.([]string) {
-					t.Params[index].Values = append(p.Values, yamlQuote(e))
-				}
-			default:
-				switch v := v.(type) {
-				case string:
-					t.Params[index].Value = yamlQuote(v)
-				case int:
-					t.Params[index].Value = strconv.Itoa(v)
-				}
+		switch p.Type {
+		case TypeStringList:
+			for _, e := range v.([]string) {
+				t.Params[index].Values = append(p.Values, yamlQuote(e))
+			}
+		default:
+			switch v := v.(type) {
+			case string:
+				t.Params[index].Value = yamlQuote(v)
+			case int:
+				t.Params[index].Value = strconv.Itoa(v)
 			}
 		}
 	}
diff --git a/util/templates/template.go b/util/templates/template.go
index 3db54350e..519b9d461 100644
--- a/util/templates/template.go
+++ b/util/templates/template.go
@@ -216,23 +216,22 @@ func (t *Template) RenderProxyWithValues(values map[string]interface{}, lang str
 	t.ModbusParams("", values)
 
 	for index, p := range t.Params {
-		for k, v := range values {
-			if p.Name != k {
-				continue
-			}
+		v, ok := values[p.Name]
+		if !ok {
+			continue
+		}
 
-			switch p.Type {
-			case TypeStringList:
-				for _, e := range v.([]string) {
-					t.Params[index].Values = append(p.Values, yamlQuote(e))
-				}
-			default:
-				switch v := v.(type) {
-				case string:
-					t.Params[index].Value = yamlQuote(v)
-				case int:
-					t.Params[index].Value = strconv.Itoa(v)
-				}
+		switch p.Type {
+		case TypeStringList:
+			for _, e := range v.([]string) {
+				t.Params[index].Values = append(p.Values, yamlQuote(e))
+			}
+		default:
+			switch v := v.(type) {
+			case string:
+				t.Params[index].Value = yamlQuote(v)
+			case int:
+				t.Params[index].Value = strconv.Itoa(v)
 			}
 		}
 	}