diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 0045b6a430e3d864d4b8792df143a187214451fe..b49cca3a1bd3df232383edd9f3f84df33954083a 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -41,7 +41,7 @@ class DynamicForm extends VerySimpleModel {
     var $_form;
     var $_fields;
     var $_has_data = false;
-    var $_dfields;
+    var $_dfields = array();
 
     function getFields($cache=true) {
         if (!isset($this->_fields) || !$cache) {
@@ -54,7 +54,7 @@ class DynamicForm extends VerySimpleModel {
     }
 
     function getDynamicFields() {
-        if (!isset($this->_dfields)) {
+        if (!isset($this->_dfields) && isset($this->id)) {
             $this->_dfields = DynamicFormField::objects()
                 ->filter(array('form_id'=>$this->id))
                 ->all();