diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
index cccf2291d..3db94b13a 100644
--- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
@@ -751,6 +751,11 @@ class Bpmn extends Handler
             //Check and validate Message Flow
             $this->throwExceptionFlowIfIsAnInvalidMessageFlow($data);
 
+            //Validating FLO_CONDITION value
+            if (array_key_exists('FLO_CONDITION', $data) && is_null($data['FLO_CONDITION'])) {
+                $data['FLO_CONDITION'] = '';
+            }
+
             //Create
             $flow = new Flow();
             $flow->fromArray($data, BasePeer::TYPE_FIELDNAME);
@@ -782,6 +787,11 @@ class Bpmn extends Handler
             //Check and validate Message Flow
             $this->throwExceptionFlowIfIsAnInvalidMessageFlow($data);
 
+            //Validating FLO_CONDITION value
+            if (array_key_exists('FLO_CONDITION', $data) && is_null($data['FLO_CONDITION'])) {
+                $data['FLO_CONDITION'] = '';
+            }
+
             //Update
             $flow = FlowPeer::retrieveByPk($floUid);
             $flow->fromArray($data);