diff --git a/crates/pinakes-plugin-api/src/ui_schema.rs b/crates/pinakes-plugin-api/src/ui_schema.rs
index f73a5ba..c96f1d3 100644
--- a/crates/pinakes-plugin-api/src/ui_schema.rs
+++ b/crates/pinakes-plugin-api/src/ui_schema.rs
@@ -801,11 +801,6 @@ impl UiElement {
           )));
         }
       },
-      Self::Form { fields, .. } if fields.is_empty() => {
-        return Err(SchemaError::ValidationError(
-          "Form must have at least one field".to_string(),
-        ));
-      },
       Self::Chart { data, .. } if !page.data_sources.contains_key(data) => {
         return Err(SchemaError::ValidationError(format!(
           "Chart references unknown data source: {data}"
@@ -867,6 +862,11 @@ impl UiElement {
         submit_action,
         ..
       } => {
+        if fields.is_empty() {
+          return Err(SchemaError::ValidationError(
+            "Form must have at least one field".to_string(),
+          ));
+        }
         for field in fields {
           validate_id(&field.id)?;
           if field.label.is_empty() {