diff --git a/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs b/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs
index 1e8b0ae..0e89690 100644
--- a/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs
+++ b/CoreHelpers.WindowsAzure.Storage.Table/Serialization/TableEntityDynamic.cs
@@ -37,7 +37,8 @@ internal static class TableEntityDynamic
             IEnumerable<PropertyInfo> objectProperties = modelType.GetTypeInfo().GetProperties();
 
             // it is not required and preferred NOT to have the type field in the model as we can ensure equality
-            builder.AddProperty(entityMapper.TypeField, modelType.AssemblyQualifiedName);
+            if (!string.IsNullOrEmpty(entityMapper.TypeField))
+                builder.AddProperty(entityMapper.TypeField, modelType.AssemblyQualifiedName);
 
             // visit all properties
             foreach (PropertyInfo property in objectProperties)