diff --git a/tests/test_formdef.py b/tests/test_formdef.py
index 282fa2464..010c79fce 100644
--- a/tests/test_formdef.py
+++ b/tests/test_formdef.py
@@ -410,11 +410,14 @@ def test_get_formdefs_of_all_kinds(pub):
     carddef.store()
 
     wf1 = Workflow(name='workflow with form fields formdef')
-    display_form = FormWorkflowStatusItem()
-    display_form.formdef = WorkflowFormFieldsFormDef(item=display_form)
     st1 = wf1.add_status('Status1', 'st1')
-    st1.items.append(display_form)
-    display_form.parent = st1
+    display_form1 = FormWorkflowStatusItem()
+    display_form1.formdef = WorkflowFormFieldsFormDef(item=display_form1)
+    display_form1.parent = st1
+    display_form2 = FormWorkflowStatusItem()
+    display_form2.parent = st1
+    st1.items.append(display_form1)
+    st1.items.append(display_form2)  # empty formdef
     wf1.store()
 
     wf2 = Workflow(name='workflow with variables fields formdef')
diff --git a/wcs/formdef.py b/wcs/formdef.py
index 4cce8988e..3ba4219ec 100644
--- a/wcs/formdef.py
+++ b/wcs/formdef.py
@@ -1642,7 +1642,7 @@ def get_formdefs_of_all_kinds():
     for workflow in Workflow.select(**kwargs):
         for status in workflow.possible_status:
             for item in status.items:
-                if isinstance(item, FormWorkflowStatusItem):
+                if isinstance(item, FormWorkflowStatusItem) and item.formdef:
                     formdefs.append(item.formdef)
         if workflow.variables_formdef:
             formdefs.append(workflow.variables_formdef)