diff --git a/includes/webform_workflow.field_instances.inc b/includes/webform_workflow.field_instances.inc
index 9eb1670..404ec25 100644
--- a/includes/webform_workflow.field_instances.inc
+++ b/includes/webform_workflow.field_instances.inc
@@ -12,10 +12,17 @@
  */
 function _webform_workflow_node_field_instances() {
   $field_instances = array();
+  $types = node_type_get_types();
+  $bundle = array('webform');
+  foreach ($types as $type) {
+  	if (variable_get('webform_node_' . $type->type, FALSE)) {
+  	  $bundle[] = $type->type;	
+  	}
+  }
 
   // Exported field_instance: 'node-webform-webform_workflow_states'
   $field_instances['node-webform-webform_workflow_states'] = array(
-    'bundle' => 'webform',
+    'bundle' => $bundle,
     'deleted' => 0,
     'description' => 'Configure the workflow states that can be assigned to this form\'s submissions.',
     'display' => array(