diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php
index d48fbec92..6c7a2cf65 100755
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -173,7 +173,9 @@ class Dynaform extends BaseDynaform
             if (isset($aData["DYN_CONTENT"])) {
                 $this->setDynContent($aData["DYN_CONTENT"]);
             }
-            $this->setDynVersion( $aData['DYN_VERSION'] );
+            if (isset($aData["DYN_VERSION"])) {
+                $this->setDynVersion( $aData['DYN_VERSION'] );
+            }
             if ($this->validate()) {
                 $con->begin();
                 $res = $this->save();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
index 70f1b9f15..4e22170c5 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
@@ -365,6 +365,10 @@ class DynaForm
             //Create
             $dynaForm = new \Dynaform();
 
+            if (isset($arrayData["DYN_VERSION"])) {
+                $arrayData["DYN_VERSION"] = 1;
+            }
+
             $arrayData["PRO_UID"] = $processUid;
 
             $dynaFormUid = $dynaForm->create($arrayData);
@@ -953,6 +957,10 @@ class DynaForm
                 $record["DYN_DESCRIPTION"] = \Content::load("DYN_DESCRIPTION", "", $record["DYN_UID"], SYS_LANG);
             }
 
+            if ($record["DYN_VERSION"] == 0) {
+                $record["DYN_VERSION"] = 1;
+            }
+
             return array(
                 $this->getFieldNameByFormatFieldName("DYN_UID")         => $record["DYN_UID"],
                 $this->getFieldNameByFormatFieldName("DYN_TITLE")       => $record["DYN_TITLE"],