diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
index 6201bc6e6..cbb9232b3 100644
--- a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
@@ -492,6 +492,15 @@ public class ApiClient {
             collectionFormat = CollectionFormat.CSV;
         }
 
+        if (value instanceof Map) {
+            Map map = (Map) value;
+
+            for (Object key : map.keySet()) {
+                params.add(parameterToString(key), parameterToString(map.get(key)));
+            }
+            return params;
+        }
+
         Collection<?> valueCollection = null;
         if (value instanceof Collection) {
             valueCollection = (Collection<?>) value;
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
index 72b80bac8..1b22c2427 100644
--- a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
@@ -382,6 +382,15 @@ public class ApiClient {
             collectionFormat = CollectionFormat.CSV;
         }
 
+        if (value instanceof Map) {
+            Map map = (Map) value;
+
+            for (Object key : map.keySet()) {
+                params.add(parameterToString(key), parameterToString(map.get(key)));
+            }
+            return params;
+        }
+
         Collection<?> valueCollection = null;
         if (value instanceof Collection) {
             valueCollection = (Collection<?>) value;