diff --git a/cloud/lambda-jsonapi-test.js b/cloud/lambda-jsonapi-test.js
index 5747004b550bdd51662df33aac632ec25438fd45..cc2dd340f896b00edd7ba6cca7ce77cc0d1a1fd9 100644
--- a/cloud/lambda-jsonapi-test.js
+++ b/cloud/lambda-jsonapi-test.js
@@ -169,7 +169,9 @@ function generateRowId(subid) {
       };
       // Adding attributes as column in dynamoDb
       for (var prop in attrs) {
-          content[prop] = attrs[prop];
+          if (attrs[prop] != null && attrs[prop].length>0)
+            // Empty field cannot be persisted
+             content[prop] = attrs[prop];
       }
       // Dealing with relationships if any
       if (relations){
diff --git a/cloud/lambda/lambda-jsonapi.js b/cloud/lambda/lambda-jsonapi.js
index 99b21c4702b8da9ddfc31aebae55d0cfd6651436..57264d0fa271c722e5598624c2bbe3b07ec623e2 100644
--- a/cloud/lambda/lambda-jsonapi.js
+++ b/cloud/lambda/lambda-jsonapi.js
@@ -160,7 +160,9 @@ function generateRowId(subid) {
       };
       // Adding attributes as column in dynamoDb
       for (var prop in attrs) {
-          content[prop] = attrs[prop];
+        if (attrs[prop] != null && attrs[prop].length>0)
+            // Empty field cannot be persisted
+            content[prop] = attrs[prop];
       }
       // Dealing with relationships if any
       if (relations){