diff --git a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
index 8c5d1954662..9e9b569b9d5 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
@@ -7,9 +7,8 @@ package {{package}}
 
 {{#model}}
 case class {{classname}} (
-  {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}] {{#description}}  // {{description}}{{/description}}
-  {{/isNotRequired}}{{#hasMore}},
-  {{/hasMore}}{{/vars}}
+  {{#vars}}{{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{#description}}  // {{description}}{{/description}}
+  {{/vars}}
 )
 {{/model}}
 {{/models}}
\ No newline at end of file