diff --git a/XCode/Code/EntityBuilder.cs b/XCode/Code/EntityBuilder.cs
index 4f4fe8108..6ef3df33b 100644
--- a/XCode/Code/EntityBuilder.cs
+++ b/XCode/Code/EntityBuilder.cs
@@ -988,7 +988,7 @@ protected virtual void BuildMap()
                     else if (mapName.DataType == typeof(String))
                         WriteLine("public {3} {0} => {1}?.{2};", myName, name, mapName.Name, type);
                     else
-                        WriteLine("public {3} {0} => {1} != null ? {1}.{2} : 0;", myName, name, mapName.Name, mapName.DataType.Name);
+                        WriteLine("public {3} {0} => {1} != null ? {1}.{2} : default;", myName, name, mapName.Name, mapName.DataType.Name);
                 }
             }
 
@@ -2081,4 +2081,4 @@ private Boolean IsDataTime(IDataColumn column)
         return false;
     }
     #endregion
-}
\ No newline at end of file
+}