diff --git a/citydb-operation/src/main/java/org/citydb/operation/importer/feature/FeatureImporter.java b/citydb-operation/src/main/java/org/citydb/operation/importer/feature/FeatureImporter.java
index 1e5c807f..a29b4996 100644
--- a/citydb-operation/src/main/java/org/citydb/operation/importer/feature/FeatureImporter.java
+++ b/citydb-operation/src/main/java/org/citydb/operation/importer/feature/FeatureImporter.java
@@ -81,21 +81,21 @@ public FeatureDescriptor doImport(Feature feature) throws ImportException, SQLEx
         if (terminationDate != null) {
             stmt.setObject(12, terminationDate);
         } else {
-            stmt.setNull(12, Types.TIMESTAMP);
+            stmt.setNull(12, Types.TIMESTAMP_WITH_TIMEZONE);
         }
 
         OffsetDateTime validFrom = feature.getValidFrom().orElse(null);
         if (validFrom != null) {
             stmt.setObject(13, validFrom);
         } else {
-            stmt.setNull(13, Types.TIMESTAMP);
+            stmt.setNull(13, Types.TIMESTAMP_WITH_TIMEZONE);
         }
 
         OffsetDateTime validTo = feature.getValidTo().orElse(null);
         if (validTo != null) {
             stmt.setObject(14, validTo);
         } else {
-            stmt.setNull(14, Types.TIMESTAMP);
+            stmt.setNull(14, Types.TIMESTAMP_WITH_TIMEZONE);
         }
 
         addBatch();
diff --git a/citydb-operation/src/main/java/org/citydb/operation/importer/property/AttributeImporter.java b/citydb-operation/src/main/java/org/citydb/operation/importer/property/AttributeImporter.java
index 3b2de7c9..3ecfaa28 100644
--- a/citydb-operation/src/main/java/org/citydb/operation/importer/property/AttributeImporter.java
+++ b/citydb-operation/src/main/java/org/citydb/operation/importer/property/AttributeImporter.java
@@ -78,7 +78,7 @@ private PropertyDescriptor doImport(Attribute attribute, long propertyId, long p
         if (timestamp != null) {
             stmt.setObject(10, timestamp);
         } else {
-            stmt.setNull(10, Types.TIMESTAMP);
+            stmt.setNull(10, Types.TIMESTAMP_WITH_TIMEZONE);
         }
 
         stmt.setString(11, attribute.getURI().orElse(null));