diff --git a/dbcon/dmlpackage/dmlcolumn.cpp b/dbcon/dmlpackage/dmlcolumn.cpp
index 9bd0f67a8..f2a98f7d6 100644
--- a/dbcon/dmlpackage/dmlcolumn.cpp
+++ b/dbcon/dmlpackage/dmlcolumn.cpp
@@ -40,10 +40,6 @@ DMLColumn::DMLColumn(std::string name, std::string value, bool isFromCol, uint32
 {
     fName = name;
     fData = value;
-    if (( strcasecmp(value.c_str(), "NULL") == 0) || (value.length() == 0) )
-    {
-          isNULL = true;
-    } 
     fisNULL = isNULL;
 	fIsFromCol = isFromCol;
 	fFuncScale = funcScale;
diff --git a/dbcon/dmlpackage/dmlpkg.h b/dbcon/dmlpackage/dmlpkg.h
index 3bef09343..924d974fd 100644
--- a/dbcon/dmlpackage/dmlpkg.h
+++ b/dbcon/dmlpackage/dmlpkg.h
@@ -409,8 +409,9 @@ public:
     std::string fColumn;
     std::string fOperator;
     std::string fScalarExpression;
-	bool fFromCol;
-	uint32_t fFuncScale;
+    bool fFromCol;
+    uint32_t fFuncScale;
+    bool fIsNull = false;
 };
 
 /** @brief Stores a value list or a query specification
diff --git a/dbcon/dmlpackage/updatedmlpackage.cpp b/dbcon/dmlpackage/updatedmlpackage.cpp
index 05ca4f117..aa3504010 100644
--- a/dbcon/dmlpackage/updatedmlpackage.cpp
+++ b/dbcon/dmlpackage/updatedmlpackage.cpp
@@ -245,7 +245,8 @@ void UpdateDMLPackage::buildUpdateFromMysqlBuffer(UpdateSqlStatement&  updateStm
     while (iter != updateStmt.fColAssignmentListPtr->end())
     {
         ColumnAssignment* colaPtr  = *iter;
-        DMLColumn* colPtr = new DMLColumn(colaPtr->fColumn, colaPtr->fScalarExpression, colaPtr->fFromCol, colaPtr->fFuncScale);
+        DMLColumn* colPtr = new DMLColumn(colaPtr->fColumn, colaPtr->fScalarExpression, colaPtr->fFromCol, colaPtr->fFuncScale,
+            colaPtr->fIsNull);
         rowPtr->get_ColumnList().push_back(colPtr);
 
         ++iter;
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index c1f37c9ac..7bb6ad212 100755
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -1044,8 +1044,9 @@ uint32_t doUpdateDelete(THD *thd)
             else if ( value->type() ==  Item::NULL_ITEM )
             {
 //                dmlStmt += "NULL";
-                columnAssignmentPtr->fScalarExpression = "NULL";
+                columnAssignmentPtr->fScalarExpression = "";
                 columnAssignmentPtr->fFromCol = false;
+                columnAssignmentPtr->fIsNull = true;
             }
             else if ( value->type() == Item::SUBSELECT_ITEM )
             {