diff --git a/lib/src/types/text_codec.dart b/lib/src/types/text_codec.dart
index acd385e..c423946 100644
--- a/lib/src/types/text_codec.dart
+++ b/lib/src/types/text_codec.dart
@@ -255,13 +255,12 @@ class PostgresTextDecoder {
 
       case TypeOid.timestampWithTimezone:
       case TypeOid.timestampWithoutTimezone:
-        return DateTime.parse(di.asText);
-
+        return DateTime.parse('${di.asText}Z');
       case TypeOid.numeric:
         return di.asText;
 
       case TypeOid.date:
-        return DateTime.parse(di.asText);
+        return DateTime.parse('${di.asText}T00:00:00Z');
 
       case TypeOid.json:
       case TypeOid.jsonb: