diff --git a/IoTSharp.Data.PostgreSQL/NpgsqlModelBuilderOptions.cs b/IoTSharp.Data.PostgreSQL/NpgsqlModelBuilderOptions.cs
index 56741fc341f67c8da44ad9f94974013ae51f9ca8..af7fdf39c7e705a190e0844065af49c951c4ba58 100644
--- a/IoTSharp.Data.PostgreSQL/NpgsqlModelBuilderOptions.cs
+++ b/IoTSharp.Data.PostgreSQL/NpgsqlModelBuilderOptions.cs
@@ -14,6 +14,9 @@ namespace IoTSharp.Data.PostgreSQL
 
         public void OnModelCreating(ModelBuilder modelBuilder)
         {
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+            AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
+
             modelBuilder.Entity<TelemetryData>()
             .Property(b => b.DateTime)
             .HasColumnType("timestamp with time zone");