diff --git a/djblets/configforms/templates/configforms/config.html b/djblets/configforms/templates/configforms/config.html
index f410abd89030554eb2e02fac82ee7f59b6bf9e1b..f92a27fc4f8cb51335fea6d2e1f7743d2345a5fd 100644
--- a/djblets/configforms/templates/configforms/config.html
+++ b/djblets/configforms/templates/configforms/config.html
@@ -85,15 +85,23 @@
         formView = new {{form.js_view_class}}({
             {{form.get_js_view_data|json_dumps_items:','}}
 {%     if form.js_model_class %}
+{%      with form_model_data=form.get_js_model_data %}
             model: new {{form.js_model_class}}({
-                {{form.get_js_model_data|json_dumps_items:','}}
+{%       if form_model_data and js_model_class %}
+                {{js_model_data|json_dumps_items:','}}
                 config: config
-            },
-{%     endif %}
+{%       elif form_model_data %}
+                {{js_model_data|json_dumps_items}}
+{%       elif js_model_class %}
+                config: config
+ {%      endif %}
+{%      endwith %}
+            }),
+{%     endif  %}
             el: $('#form_{{form.form_id}}'),
             configView: configView
         });
-        formView.render()
+        formView.render();
 {%    endif %}
 {%   endfor %}
 {%  endspaceless %}