diff --git a/database/gdb/gdb_core_structure.go b/database/gdb/gdb_core_structure.go
index bf80272e42f..38daa20f299 100644
--- a/database/gdb/gdb_core_structure.go
+++ b/database/gdb/gdb_core_structure.go
@@ -88,11 +88,15 @@ func (c *Core) ConvertDataForRecordValue(ctx context.Context, value interface{})
 		case gtime.Time:
 			if r.IsZero() {
 				convertedValue = nil
+			} else {
+				convertedValue = r.Time
 			}
 
 		case *gtime.Time:
 			if r.IsZero() {
 				convertedValue = nil
+			} else {
+				convertedValue = r.Time
 			}
 
 		case *time.Time: