diff --git a/hudi-common/src/main/avro/HoodieArchivedMetaEntry.avsc b/hudi-common/src/main/avro/HoodieArchivedMetaEntry.avsc
index 626b478a4..7c57e045e 100644
--- a/hudi-common/src/main/avro/HoodieArchivedMetaEntry.avsc
+++ b/hudi-common/src/main/avro/HoodieArchivedMetaEntry.avsc
@@ -26,7 +26,7 @@
             "null",
             "HoodieCommitMetadata"
          ],
-         "default": "null"
+         "default": null
       },
       {
          "name":"hoodieCleanMetadata",
@@ -34,7 +34,7 @@
             "null",
             "HoodieCleanMetadata"
          ],
-         "default": "null"
+         "default": null
       },
       {
          "name":"hoodieCompactionMetadata",
@@ -42,7 +42,7 @@
             "null",
             "HoodieCompactionMetadata"
          ],
-         "default": "null"
+         "default": null
       },
       {
          "name":"hoodieRollbackMetadata",
@@ -50,7 +50,7 @@
             "null",
             "HoodieRollbackMetadata"
          ],
-         "default": "null"
+         "default": null
       },
       {
          "name":"hoodieSavePointMetadata",
@@ -58,15 +58,17 @@
             "null",
             "HoodieSavepointMetadata"
          ],
-         "default": "null"
+         "default": null
       },
       {
          "name":"commitTime",
-         "type":["null","string"]
+         "type":["null","string"],
+         "default": null
       },
       {
          "name":"actionType",
-         "type":["null","string"]
+         "type":["null","string"],
+         "default": null
       },
       {
          "name":"version",
diff --git a/hudi-common/src/main/avro/HoodieCommitMetadata.avsc b/hudi-common/src/main/avro/HoodieCommitMetadata.avsc
index 7796d99d7..bdd2aca11 100644
--- a/hudi-common/src/main/avro/HoodieCommitMetadata.avsc
+++ b/hudi-common/src/main/avro/HoodieCommitMetadata.avsc
@@ -118,14 +118,16 @@
                   ]
                }
             }
-         }]
+         }],
+         "default": null
       },
       {
          "name":"extraMetadata",
          "type":["null", {
             "type":"map",
             "values":"string"
-         }]
+         }],
+         "default": null
       },
       {
          "name":"version",
diff --git a/hudi-common/src/main/avro/HoodieCompactionMetadata.avsc b/hudi-common/src/main/avro/HoodieCompactionMetadata.avsc
index b4da80e35..3d2ac43e1 100644
--- a/hudi-common/src/main/avro/HoodieCompactionMetadata.avsc
+++ b/hudi-common/src/main/avro/HoodieCompactionMetadata.avsc
@@ -32,23 +32,28 @@
                   "fields":[
                      {
                         "name":"partitionPath",
-                        "type":["null","string"]
+                        "type":["null","string"],
+                        "default": null
                      },
                      {
                         "name":"totalLogRecords",
-                        "type":["null","long"]
+                        "type":["null","long"],
+                        "default": null
                      },
                      {
                         "name":"totalLogFiles",
-                        "type":["null","long"]
+                        "type":["null","long"],
+                        "default": null
                      },
                      {
                         "name":"totalUpdatedRecordsCompacted",
-                        "type":["null","long"]
+                        "type":["null","long"],
+                        "default": null
                      },
                      {
                         "name":"hoodieWriteStat",
-                        "type":["null","HoodieWriteStat"]
+                        "type":["null","HoodieWriteStat"],
+                        "default": null
                      }
                   ]
                }
diff --git a/hudi-common/src/main/avro/HoodieRestoreMetadata.avsc b/hudi-common/src/main/avro/HoodieRestoreMetadata.avsc
index 03defbb13..28e111d37 100644
--- a/hudi-common/src/main/avro/HoodieRestoreMetadata.avsc
+++ b/hudi-common/src/main/avro/HoodieRestoreMetadata.avsc
@@ -25,8 +25,8 @@
      {"name": "hoodieRestoreMetadata", "type": {
      "type" : "map", "values" : {
         "type": "array",
-        "default": "null",
-        "items": "HoodieRollbackMetadata",
+        "default": null,
+        "items": ["null","HoodieRollbackMetadata"],
         "name": "hoodieRollbackMetadata"
      }
    }},