diff --git a/rust/cubesql/cubesql/src/compile/engine/context.rs b/rust/cubesql/cubesql/src/compile/engine/context.rs
index 7900c6403453a..ce60928aecf8a 100644
--- a/rust/cubesql/cubesql/src/compile/engine/context.rs
+++ b/rust/cubesql/cubesql/src/compile/engine/context.rs
@@ -140,7 +140,7 @@ impl TableProvider for CubeTableProvider {
                             ColumnType::Decimal(p, s) => DataType::Decimal(p, s),
                             ColumnType::List(field) => DataType::List(field.clone()),
                             ColumnType::Timestamp => {
-                                DataType::Timestamp(TimeUnit::Millisecond, None)
+                                DataType::Timestamp(TimeUnit::Nanosecond, None)
                             }
                         },
                         true,
diff --git a/rust/cubesql/cubesql/src/sql/types.rs b/rust/cubesql/cubesql/src/sql/types.rs
index c14142a455cd9..f294e5540fa05 100644
--- a/rust/cubesql/cubesql/src/sql/types.rs
+++ b/rust/cubesql/cubesql/src/sql/types.rs
@@ -89,7 +89,7 @@ impl ColumnType {
             ColumnType::Blob => DataType::Utf8,
             ColumnType::Decimal(p, s) => DataType::Decimal(*p, *s),
             ColumnType::List(field) => DataType::List(field.clone()),
-            ColumnType::Timestamp => DataType::Timestamp(TimeUnit::Millisecond, None),
+            ColumnType::Timestamp => DataType::Timestamp(TimeUnit::Nanosecond, None),
         }
     }
 }