diff --git a/package.json b/package.json
index 8966b31a..8be051ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.6.1",
+  "version": "1.6.1-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
diff --git a/src/components/render/FormRender.vue b/src/components/render/FormRender.vue
index 124b4305..d172ec27 100644
--- a/src/components/render/FormRender.vue
+++ b/src/components/render/FormRender.vue
@@ -32,7 +32,7 @@ const formData = ref<any>(elementProps.form || {})
 <template>
   <Component
     :is="formItem.component"
-    v-if="!formItem.html && formItem.props?.modelvalue"
+    v-if="!formItem.html && !!formItem.props?.modelvalue"
     v-bind="formItem.props"
     v-model:value="formData[formItem.props?.modelvalue]"
   >
@@ -42,7 +42,7 @@ const formData = ref<any>(elementProps.form || {})
       :key="innerIndex"
     >
       <FormRender
-        v-if="innerItem.props?.modelvalue"
+        v-if="!!innerItem.props?.modelvalue"
         v-model:value="formData[innerItem.props?.modelvalue]"
         :config="innerItem"
         :form="formData"
@@ -57,7 +57,13 @@ const formData = ref<any>(elementProps.form || {})
   </Component>
   <Component
     :is="formItem.component"
-    v-if="!formItem.html"
+    v-else-if="formItem.html"
+    v-bind="formItem.props"
+    v-html="formItem.html"
+  />
+  <Component
+    :is="formItem.component"
+    v-else
     v-bind="formItem.props"
     v-model="formData[formItem.props?.model]"
   >
@@ -67,7 +73,7 @@ const formData = ref<any>(elementProps.form || {})
       :key="innerIndex"
     >
       <FormRender
-        v-if="innerItem.props?.modelvalue"
+        v-if="!!innerItem.props?.modelvalue"
         v-model:value="formData[innerItem.props?.modelvalue]"
         :config="innerItem"
         :form="formData"
@@ -80,10 +86,4 @@ const formData = ref<any>(elementProps.form || {})
       />
     </template>
   </Component>
-  <Component
-    :is="formItem.component"
-    v-if="formItem.html"
-    v-bind="formItem.props"
-    v-html="formItem.html"
-  />
 </template>